4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx> commit b3906535ccc6cd04c42f9b1c7e31d1947b3ebc74 upstream. The driver supports internal and external FDD units so the floppy_open function must not hard-code the drive location. Cc: Laurent Vivier <lvivier@xxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx # v4.14+ Tested-by: Stan Johnson <userm57@xxxxxxxxx> Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx> Acked-by: Laurent Vivier <lvivier@xxxxxxxxxx> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/block/swim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -646,7 +646,7 @@ static int floppy_open(struct block_devi swim_write(base, setup, S_IBM_DRIVE | S_FCLK_DIV2); udelay(10); - swim_drive(base, INTERNAL_DRIVE); + swim_drive(base, fs->location); swim_motor(base, ON); swim_action(base, SETMFM); if (fs->ejected)