diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 15:21:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 15:21:50 -0800 |
| commit | ed9fd93e9a0c327e5d02313ba6e233c8e76da118 (patch) | |
| tree | 77b3ac9a1243e29bad14e5d3cb80f1ffe8d60bb6 /drivers/scsi/sd_dif.c | |
| parent | 52c7b3f45dbf19359be60a95b8678656e73ce42b (diff) | |
| parent | 4e46bf89972b9d98a9f282a9fed2359756a5e34e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] fix crash when disconnecting usb storage
[SCSI] fix async scan add/remove race resulting in an oops
[SCSI] sd: Return correct error code for DIF
Diffstat (limited to 'drivers/scsi/sd_dif.c')
| -rw-r--r-- | drivers/scsi/sd_dif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c index 88da9774571..84be62149c6 100644 --- a/drivers/scsi/sd_dif.c +++ b/drivers/scsi/sd_dif.c @@ -418,7 +418,7 @@ error: __func__, virt, phys, be32_to_cpu(sdt->ref_tag), be16_to_cpu(sdt->app_tag)); - return -EIO; + return -EILSEQ; } /* |