diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
| commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
| tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /drivers/usb/storage/scsiglue.c | |
| parent | e7c3aad53dba54d375b632f2a21b680546828dec (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
| -rw-r--r-- | drivers/usb/storage/scsiglue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 4837524eada7..4ef5527028c5 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
| @@ -109,7 +109,7 @@ static int slave_configure(struct scsi_device *sdev) | |||
| 109 | * data comes from. | 109 | * data comes from. |
| 110 | */ | 110 | */ |
| 111 | if (sdev->scsi_level < SCSI_2) | 111 | if (sdev->scsi_level < SCSI_2) |
| 112 | sdev->scsi_level = SCSI_2; | 112 | sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2; |
| 113 | 113 | ||
| 114 | /* According to the technical support people at Genesys Logic, | 114 | /* According to the technical support people at Genesys Logic, |
| 115 | * devices using their chips have problems transferring more than | 115 | * devices using their chips have problems transferring more than |
| @@ -162,7 +162,7 @@ static int slave_configure(struct scsi_device *sdev) | |||
| 162 | * a Get-Max-LUN request, we won't lose much by setting the | 162 | * a Get-Max-LUN request, we won't lose much by setting the |
| 163 | * revision level down to 2. The only devices that would be | 163 | * revision level down to 2. The only devices that would be |
| 164 | * affected are those with sparse LUNs. */ | 164 | * affected are those with sparse LUNs. */ |
| 165 | sdev->scsi_level = SCSI_2; | 165 | sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2; |
| 166 | 166 | ||
| 167 | /* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable | 167 | /* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable |
| 168 | * Hardware Error) when any low-level error occurs, | 168 | * Hardware Error) when any low-level error occurs, |