summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2018-04-12 03:50:14 +0300
committerJens Axboe <axboe@kernel.dk>2018-04-17 06:49:35 +0300
commit8a500df63d07d8aee44b7ee2c54e462e47ce93ec (patch)
treeb2f60b2e70d432e6c2a292a212a6e568f2617400 /drivers/block
parent56a1c5ee54f69dd767fb61d301883dc919ddc259 (diff)
downloadlinux-8a500df63d07d8aee44b7ee2c54e462e47ce93ec.tar.xz
block/swim: Check drive type
The SWIM chip is compatible with GCR-mode Sony 400K/800K drives but this driver only supports MFM mode. Therefore only Sony FDHD drives are supported. Skip incompatible drives. 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')
-rw-r--r--drivers/block/swim.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index d1ee4670666a..c8c8b9da3edd 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -829,10 +829,12 @@ static int swim_floppy_init(struct swim_priv *swd)
/* scan floppy drives */
swim_drive(base, INTERNAL_DRIVE);
- if (swim_readbit(base, DRIVE_PRESENT))
+ if (swim_readbit(base, DRIVE_PRESENT) &&
+ !swim_readbit(base, ONEMEG_DRIVE))
swim_add_floppy(swd, INTERNAL_DRIVE);
swim_drive(base, EXTERNAL_DRIVE);
- if (swim_readbit(base, DRIVE_PRESENT))
+ if (swim_readbit(base, DRIVE_PRESENT) &&
+ !swim_readbit(base, ONEMEG_DRIVE))
swim_add_floppy(swd, EXTERNAL_DRIVE);
/* register floppy drives */