Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into...

[karo-tx-linux.git] / drivers / usb / storage / scsiglue.c

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index e80362d148f31bcf5d8a32b343afea4cc56437a0..a688b1e686eae326d26da45bf37fa378524e6624 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -209,6 +209,10 @@ static int slave_configure(struct scsi_device *sdev)
                if (us->fflags & US_FL_CAPACITY_HEURISTICS)
                        sdev->guess_capacity = 1;
 
+               /* Some devices cannot handle READ_CAPACITY_16 */
+               if (us->fflags & US_FL_NO_READ_CAPACITY_16)
+                       sdev->no_read_capacity_16 = 1;
+
                /* assume SPC3 or latter devices support sense size > 18 */
                if (sdev->scsi_level > SCSI_SPC_2)
                        us->fflags |= US_FL_SANE_SENSE;
@@ -253,6 +257,10 @@ static int slave_configure(struct scsi_device *sdev)
                 * or to force 192-byte transfer lengths for MODE SENSE.
                 * But they do need to use MODE SENSE(10). */
                sdev->use_10_for_ms = 1;
+
+               /* Some (fake) usb cdrom devices don't like READ_DISC_INFO */
+               if (us->fflags & US_FL_NO_READ_DISC_INFO)
+                       sdev->no_read_disc_info = 1;
        }
 
        /* The CB and CBI transports have no way to pass LUN values