From mboxrd@z Thu Jan 1 00:00:00 1970 From: Derek Basehore Subject: [PATCH v2 3/3] scsi: allow scsi devices to use direct complete Date: Wed, 24 Feb 2016 16:22:28 -0800 Message-ID: <1456359748-22838-3-git-send-email-dbasehore@chromium.org> References: <1456359748-22838-1-git-send-email-dbasehore@chromium.org> Return-path: In-Reply-To: <1456359748-22838-1-git-send-email-dbasehore@chromium.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, "Martin K . Petersen" , linux-scsi@vger.kernel.org, Derek Basehore List-Id: linux-pm@vger.kernel.org This allows scsi devices to remain runtime suspended for system suspend. Since runtime suspend is stricter than system suspend callbacks, this is just returning a positive number for the prepare callback. Signed-off-by: Derek Basehore Reviewed-by: Eric Caruso --- drivers/scsi/scsi_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index b44c1bb..7af76ad 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -178,7 +178,7 @@ static int scsi_bus_prepare(struct device *dev) /* Wait until async scanning is finished */ scsi_complete_async_scans(); } - return 0; + return 1; } static int scsi_bus_suspend(struct device *dev) -- 2.7.0.rc3.207.g0ac5344