1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index b14dc02c3ded..18486b51668d 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -216,7 +216,7 @@ static void scsi_unlock_floptical(struct scsi_device *sdev,
         scsi_cmd[4] = 0x2a;     /* size */
         scsi_cmd[5] = 0;
         scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE, result, 0x2a, NULL,
-                         SCSI_TIMEOUT, 3);
+                         SCSI_TIMEOUT, 3, NULL);
 }
 
 /**
@@ -573,6 +573,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
 
         /* Each pass gets up to three chances to ignore Unit Attention */
         for (count = 0; count < 3; ++count) {
+                int resid;
+
                 memset(scsi_cmd, 0, 6);
                 scsi_cmd[0] = INQUIRY;
                 scsi_cmd[4] = (unsigned char) try_inquiry_len;
@@ -581,7 +583,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
 
                 result = scsi_execute_req(sdev,  scsi_cmd, DMA_FROM_DEVICE,
                                           inq_result, try_inquiry_len, &sshdr,
-                                          HZ / 2 + HZ * scsi_inq_timeout, 3);
+                                          HZ / 2 + HZ * scsi_inq_timeout, 3,
+                                          &resid);
 
                 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: INQUIRY %s "
                                 "with code 0x%x\n",
@@ -602,6 +605,14 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
                                     (sshdr.ascq == 0))
                                         continue;
                         }
+                } else {
+                        /*
+                         * if nothing was transferred, we try
+                         * again. It's a workaround for some USB
+                         * devices.
+                         */
+                        if (resid == try_inquiry_len)
+                                continue;
                 }
                 break;
         }
@@ -1390,7 +1401,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
 
                 result = scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE,
                                           lun_data, length, &sshdr,
-                                          SCSI_TIMEOUT + 4 * HZ, 3);
+                                          SCSI_TIMEOUT + 4 * HZ, 3, NULL);
 
                 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: REPORT LUNS"
                                 " %s (try %d) result 0x%x\n", result