From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Lu Subject: [PATCH v2 1/7] scsi: sr: fix for sr suspend and resume Date: Tue, 24 Jul 2012 17:37:39 +0800 Message-ID: <1343122665-18711-2-git-send-email-aaron.lu@amd.com> References: <1343122665-18711-1-git-send-email-aaron.lu@amd.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:19972 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753402Ab2GXJju (ORCPT ); Tue, 24 Jul 2012 05:39:50 -0400 In-Reply-To: <1343122665-18711-1-git-send-email-aaron.lu@amd.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Jeff Garzik , Alan Stern , Lin Ming , James Bottomley , Jeff Wu Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, Aaron Lu , Aaron Lu In sr_suspend, we do not need to do anything if it is not a runtime pm request, so just return by checking the PM_IS_AUTO macro. And in sr_resume, only reset the suspend_count back to 1 if the ODD is waken up by the user, or the usage count of the scsi device will not balance. Signed-off-by: Aaron Lu --- V2: Use PMSG_IS_AUTO as suggested by Alan Stern. drivers/scsi/sr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 3da0879..225848c 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -178,8 +178,8 @@ static int sr_suspend(struct device *dev, pm_message_t msg) struct scsi_sense_hdr sshdr; struct scsi_cd *cd = dev_get_drvdata(dev); - /* no action for system suspend */ - if (msg.event == PM_EVENT_SUSPEND) + /* no action for system pm operations */ + if (!PMSG_IS_AUTO(msg)) return 0; /* do another TUR to see if the ODD is still ready to be powered off */ @@ -217,9 +217,9 @@ static int sr_resume(struct device *dev) cd->device->wakeup_by_user = 0; if (!(cd->cdi.mask & CDC_CLOSE_TRAY)) sr_tray_move(&cd->cdi, 1); - } - atomic_set(&cd->suspend_count, 1); + atomic_set(&cd->suspend_count, 1); + } return 0; } -- 1.7.11.3