2 files changed, 13 insertions, 0 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ffa0689ee84..ff4c9a3aa5b 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1498,6 +1498,9 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
         unsigned long long lba;
         unsigned sector_size;
 
+        if (sdp->no_read_capacity_16)
+                return -EINVAL;
+
         do {
                 memset(cmd, 0, 16);
                 cmd[0] = SERVICE_ACTION_IN;
@@ -1626,6 +1629,15 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
         sector_size = get_unaligned_be32(&buffer[4]);
         lba = get_unaligned_be32(&buffer[0]);
 
+        if (sdp->no_read_capacity_16 && (lba == 0xffffffff)) {
+                /* Some buggy (usb cardreader) devices return an lba of
+                   0xffffffff when the want to report a size of 0 (with
+                   which they really mean no media is present) */
+                sdkp->capacity = 0;
+                sdkp->hw_sector_size = sector_size;
+                return sector_size;
+        }
+
         if ((sizeof(sdkp->capacity) == 4) && (lba == 0xffffffff)) {
                 sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
                         "kernel compiled with support for large block "
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index e8c2433ad8a..85867dcde33 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -149,6 +149,7 @@ struct scsi_device {
         unsigned last_sector_bug:1;     /* do not use multisector accesses on
                                            SD_LAST_BUGGY_SECTORS */
         unsigned no_read_disc_info:1;   /* Avoid READ_DISC_INFO cmds */
+        unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */
         unsigned is_visible:1;  /* is the device visible in sysfs */
 
         DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */