From patchwork Wed Sep 12 08:29:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 1441531 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CB4DEDF28C for ; Wed, 12 Sep 2012 08:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888Ab2ILIbI (ORCPT ); Wed, 12 Sep 2012 04:31:08 -0400 Received: from mga02.intel.com ([134.134.136.20]:23350 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753424Ab2ILIaR (ORCPT ); Wed, 12 Sep 2012 04:30:17 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 12 Sep 2012 01:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,408,1344236400"; d="scan'208";a="191945934" Received: from mint-spring.sh.intel.com ([10.239.36.120]) by orsmga001.jf.intel.com with ESMTP; 12 Sep 2012 01:30:13 -0700 From: Aaron Lu To: Alan Stern , Oliver Neukum , James Bottomley , Jeff Garzik Cc: linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, Aaron Lu , Aaron Lu Subject: [PATCH v7 5/6] scsi: sr: use may_power_off Date: Wed, 12 Sep 2012 16:29:56 +0800 Message-Id: <1347438597-5903-6-git-send-email-aaron.lu@intel.com> X-Mailer: git-send-email 1.7.12.21.g871e293 In-Reply-To: <1347438597-5903-1-git-send-email-aaron.lu@intel.com> References: <1347438597-5903-1-git-send-email-aaron.lu@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org If may_power_off is 0, we do not check if it is ready to be powered off in its suspend callback. Signed-off-by: Aaron Lu --- drivers/scsi/sr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index ef72682..4c1a182 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -181,7 +181,7 @@ static int sr_suspend(struct device *dev, pm_message_t msg) struct scsi_sense_hdr sshdr; struct scsi_cd *cd = dev_get_drvdata(dev); - if (!cd->device->can_power_off) + if (!cd->device->may_power_off) return 0; /* See if we can power off this ZPODD device */ @@ -786,6 +786,10 @@ static int sr_probe(struct device *dev) sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name); + /* By default, we allow power off of ZPODD */ + if (cd->device->can_power_off) + cd->device->may_power_off = 1; + /* enable runtime pm */ scsi_autopm_put_device(cd->device);