summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-10-27 16:28:13 +0100
committerChristoph Hellwig <hch@lst.de>2014-11-12 11:16:12 +0100
commite9afccc5245a35468f52bc3f53ed162caabf275d (patch)
treebf5e9df4b774866dd83b243b1cdd94662e2dd576
parentosst: call scsi_set_medium_removal directly (diff)
downloadlinux-e9afccc5245a35468f52bc3f53ed162caabf275d.tar.xz
linux-e9afccc5245a35468f52bc3f53ed162caabf275d.zip
scsi: return EAGAIN when resetting a device under EH
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.de>
-rw-r--r--drivers/scsi/scsi_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 712f159ebb69..c4f7b56fa6f6 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -278,7 +278,7 @@ int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev, int cmd,
{
if (cmd == SG_SCSI_RESET && ndelay) {
if (scsi_host_in_recovery(sdev->host))
- return -ENODEV;
+ return -EAGAIN;
} else {
if (!scsi_block_when_processing_errors(sdev))
return -ENODEV;