aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_ioctl.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-10-27 11:28:13 -0400
committerChristoph Hellwig <hch@lst.de>2014-11-12 05:16:12 -0500
commite9afccc5245a35468f52bc3f53ed162caabf275d (patch)
treebf5e9df4b774866dd83b243b1cdd94662e2dd576 /drivers/scsi/scsi_ioctl.c
parent2b3b3d61e8517b34432d1c73242b6345c9a15ebe (diff)
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>
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
-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,
278{ 278{
279 if (cmd == SG_SCSI_RESET && ndelay) { 279 if (cmd == SG_SCSI_RESET && ndelay) {
280 if (scsi_host_in_recovery(sdev->host)) 280 if (scsi_host_in_recovery(sdev->host))
281 return -ENODEV; 281 return -EAGAIN;
282 } else { 282 } else {
283 if (!scsi_block_when_processing_errors(sdev)) 283 if (!scsi_block_when_processing_errors(sdev))
284 return -ENODEV; 284 return -ENODEV;