diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2018-04-12 02:50:14 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-04-17 05:49:35 +0200 |
| commit | b3906535ccc6cd04c42f9b1c7e31d1947b3ebc74 (patch) | |
| tree | be5c97ec4c764b37535b8ad7ae42d0f1bed2dea7 /drivers/block/swim.c | |
| parent | block/swim: Fix IO error at end of medium (diff) | |
| download | linux-b3906535ccc6cd04c42f9b1c7e31d1947b3ebc74.tar.xz linux-b3906535ccc6cd04c42f9b1c7e31d1947b3ebc74.zip | |
block/swim: Select appropriate drive on device open
The driver supports internal and external FDD units so the floppy_open
function must not hard-code the drive location.
Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: stable@vger.kernel.org # v4.14+
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/swim.c')
| -rw-r--r-- | drivers/block/swim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 2c75761b61e8..0e31884a9519 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -648,7 +648,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 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) |