1 files changed, 6 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;
 
                 /*