Commit 0dd9146a authored Apr 11, 2018 by Finn Thain Committed by Greg Kroah-Hartman Apr 29, 2018

block/swim: Check drive type



commit 8a500df63d07d8aee44b7ee2c54e462e47ce93ec upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 43f8a4f2

drivers/block/swim.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -834,10 +834,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 */