diff options
| author | Nicolas Pitre | 2009-03-16 02:41:23 +0100 |
|---|---|---|
| committer | Nicolas Pitre | 2009-03-16 02:41:23 +0100 |
| commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
| tree | fcdedce488db0f80c7a816e0b52df83a01972838 /drivers/scsi/scsi_lib.c | |
| parent | [ARM] Orion: Fix some typos in the DNS-323 support code (diff) | |
| parent | [ARM] update mach-types (diff) | |
| download | kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.tar.gz kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.tar.xz kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.zip | |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 940dc32ff0dc..b82ffd90632e 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1040,12 +1040,11 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) action = ACTION_FAIL; break; case ABORTED_COMMAND: + action = ACTION_FAIL; if (sshdr.asc == 0x10) { /* DIF */ description = "Target Data Integrity Failure"; - action = ACTION_FAIL; error = -EILSEQ; - } else - action = ACTION_RETRY; + } break; case NOT_READY: /* If the device is in the process of becoming |