Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fa62b1a authored by Dmitry Katsubo's avatar Dmitry Katsubo Committed by Greg Kroah-Hartman
Browse files

usb-storage: Fix scsi-sd failure "Invalid field in cdb" for USB adapter JMicron 

The patch extends the family of SATA-to-USB JMicron adapters that need
FUA to be disabled and applies the same policy for uas driver.
See details in http://unix.stackexchange.com/questions/237204/



Signed-off-by: default avatarDmitry Katsubo <dmitry.katsubo@gmail.com>
Tested-by: default avatarDmitry Katsubo <dmitry.katsubo@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df36c5be

drivers/usb/storage/uas.c

+4 −0
Original line number Diff line number Diff line
@@ -796,6 +796,10 @@ static int uas_slave_configure(struct scsi_device *sdev) 
	if (devinfo->flags & US_FL_NO_REPORT_OPCODES)

		sdev->no_report_opcodes = 1;



	/* A few buggy USB-ATA bridges don't understand FUA */

	if (devinfo->flags & US_FL_BROKEN_FUA)

		sdev->broken_fua = 1;



	scsi_change_queue_depth(sdev, devinfo->qdepth - 2);

	return 0;

}

drivers/usb/storage/unusual_devs.h

+1 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201, 
		US_FL_IGNORE_RESIDUE ),



/* Reported by Michael Büsch <m@bues.ch> */

UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0114,

UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0116,

		"JMicron",

		"USB to ATA/ATAPI Bridge",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

drivers/usb/storage/unusual_uas.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999, 
		"JMicron",

		"JMS567",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_NO_REPORT_OPCODES),

		US_FL_BROKEN_FUA | US_FL_NO_REPORT_OPCODES),



/* Reported-by: Hans de Goede <hdegoede@redhat.com> */

UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999,