diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
| commit | 6e03f99803195e5aaf7f247db31b0d11857ccc35 (patch) | |
| tree | ffd4b1a140854977e984a4390105333845c0e90c /drivers/scsi/scsi_error.c | |
| parent | 982162602b31041b426edec6480d327743abcbcc (diff) | |
| parent | 6bfb09a1005193be5c81ebac9f3ef85210142650 (diff) | |
Merge branch 'linus' into x86/iommu
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 880051c89bd..39ce3aba1da 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -391,7 +391,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd) case HARDWARE_ERROR: if (scmd->device->retry_hwerror) - return NEEDS_RETRY; + return ADD_TO_MLQUEUE; else return SUCCESS; |