Skip to content

Commit

Permalink
floppy: make sure to reset all FDCs upon resume()
Browse files Browse the repository at this point in the history
In floppy_resume() we don't properly reinitialize all FDCs, instead
we reinitialize the current FDC once per available FDC because value
-1 is passed to user_reset_fdc(). Let's simply save the current drive
and properly reinitialize each FDC.

Link: https://lore.kernel.org/r/20200410101904.14652-1-w@1wt.eu
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>
  • Loading branch information
wtarreau authored and evdenis committed May 12, 2020
1 parent 05f5e31 commit 6111a4f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -4545,11 +4545,13 @@ static void floppy_device_release(struct device *dev)
static int floppy_resume(struct device *dev)
{
int fdc;
int saved_drive;

saved_drive = current_drive;
for (fdc = 0; fdc < N_FDC; fdc++)
if (fdc_state[fdc].address != -1)
user_reset_fdc(-1, FD_RESET_ALWAYS, false);

user_reset_fdc(REVDRIVE(fdc, 0), FD_RESET_ALWAYS, false);
set_fdc(saved_drive);
return 0;
}

Expand Down

0 comments on commit 6111a4f

Please sign in to comment.