2 files changed, 18 insertions, 2 deletions

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index fde2e71a6ade..a73ea495d5a7 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -235,8 +235,12 @@ static int slave_configure(struct scsi_device *sdev)
                 if (!(us->fflags & US_FL_NEEDS_CAP16))
                         sdev->try_rc_10_first = 1;
 
-                /* assume SPC3 or latter devices support sense size > 18 */
-                if (sdev->scsi_level > SCSI_SPC_2)
+                /*
+                 * assume SPC3 or latter devices support sense size > 18
+                 * unless US_FL_BAD_SENSE quirk is specified.
+                 */
+                if (sdev->scsi_level > SCSI_SPC_2 &&
+                    !(us->fflags & US_FL_BAD_SENSE))
                         us->fflags |= US_FL_SANE_SENSE;
 
                 /*
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index f7f83b21dc74..ea0d27a94afe 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1266,6 +1266,18 @@ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
                 US_FL_FIX_CAPACITY ),
 
 /*
+ * Reported by Icenowy Zheng <icenowy@aosc.io>
+ * The SMI SM3350 USB-UFS bridge controller will enter a wrong state
+ * that do not process read/write command if a long sense is requested,
+ * so force to use 18-byte sense.
+ */
+UNUSUAL_DEV(  0x090c, 0x3350, 0x0000, 0xffff,
+                "SMI",
+                "SM3350 UFS-to-USB-Mass-Storage bridge",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_BAD_SENSE ),
+
+/*
  * Reported by Paul Hartman <paul.hartman+linux@gmail.com>
  * This card reader returns "Illegal Request, Logical Block Address
  * Out of Range" for the first READ(10) after a new card is inserted.