aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/scsiglue.c
diff options
context:
space:
mode:
authorMatthew Dharm <mdharm-usb@one-eyed-alien.net>2005-06-06 20:22:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-27 17:44:03 -0400
commit86dbde9cbdfe8bc2c2dfe5d33027d3acc55e0470 (patch)
tree0dcfa65023ca3df8816bd7bbb42c19b443096a48 /drivers/usb/storage/scsiglue.c
parent4d07ef762fc8d6d35ecc1511a3b953a733a61a5f (diff)
[PATCH] USB Storage: retry hard errors
This patch started life as as527, and was rediffed by me. Since the IDE interface doesn't convey much information about types of errors, many USB-IDE adapters report all low-level errors with SK = 0x04, which is supposed to be used only for non-recoverable errors. As a result the SCSI midlayer doesn't retry the command. But quite often a retry would succeed, whereas an unnecessary retry doesn't really hurt anything. This patch uses a recently-implemented flag to tell the SCSI midlayer that such hardware errors should be retried. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
-rw-r--r--drivers/usb/storage/scsiglue.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index da2bfa944b96..af294bb68c35 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -155,6 +155,15 @@ static int slave_configure(struct scsi_device *sdev)
155 * If this device makes that mistake, tell the sd driver. */ 155 * If this device makes that mistake, tell the sd driver. */
156 if (us->flags & US_FL_FIX_CAPACITY) 156 if (us->flags & US_FL_FIX_CAPACITY)
157 sdev->fix_capacity = 1; 157 sdev->fix_capacity = 1;
158
159 /* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable
160 * Hardware Error) when any low-level error occurs,
161 * recoverable or not. Setting this flag tells the SCSI
162 * midlayer to retry such commands, which frequently will
163 * succeed and fix the error. The worst this can lead to
164 * is an occasional series of retries that will all fail. */
165 sdev->retry_hwerror = 1;
166
158 } else { 167 } else {
159 168
160 /* Non-disk-type devices don't need to blacklist any pages 169 /* Non-disk-type devices don't need to blacklist any pages