diff options
Diffstat (limited to 'drivers/scsi/scsi_pm.c')
| -rw-r--r-- | drivers/scsi/scsi_pm.c | 11 | 
1 files changed, 3 insertions, 8 deletions
| diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index 42539ee2cb11..4c5aabe21755 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -229,8 +229,6 @@ static int scsi_runtime_resume(struct device *dev)  static int scsi_runtime_idle(struct device *dev)  { -	int err; -  	dev_dbg(dev, "scsi_runtime_idle\n");  	/* Insert hooks here for targets, hosts, and transport classes */ @@ -240,14 +238,11 @@ static int scsi_runtime_idle(struct device *dev)  		if (sdev->request_queue->dev) {  			pm_runtime_mark_last_busy(dev); -			err = pm_runtime_autosuspend(dev); -		} else { -			err = pm_runtime_suspend(dev); +			pm_runtime_autosuspend(dev); +			return -EBUSY;  		} -	} else { -		err = pm_runtime_suspend(dev);  	} -	return err; +	return 0;  }  int scsi_autopm_get_device(struct scsi_device *sdev) |