From patchwork Fri Mar 14 05:46:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 330210 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3B9822C00CC for ; Fri, 14 Mar 2014 16:45:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065AbaCNFpn (ORCPT ); Fri, 14 Mar 2014 01:45:43 -0400 Received: from mga02.intel.com ([134.134.136.20]:59736 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752172AbaCNFpn (ORCPT ); Fri, 14 Mar 2014 01:45:43 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 Mar 2014 22:45:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,652,1389772800"; d="scan'208";a="499658607" Received: from aaronlu.sh.intel.com ([10.239.37.27]) by orsmga002.jf.intel.com with ESMTP; 13 Mar 2014 22:45:41 -0700 From: Aaron Lu To: Tejun Heo Cc: linux-ide@vger.kernel.org Subject: [PATCH 2/3] libata: acpi: avoid passing NULL to ACPI evaluation method Date: Fri, 14 Mar 2014 13:46:09 +0800 Message-Id: <1394775970-6022-3-git-send-email-aaron.lu@intel.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394775970-6022-1-git-send-email-aaron.lu@intel.com> References: <1394775970-6022-1-git-send-email-aaron.lu@intel.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org If ACPI handle for an ATA device is NULL, we shouldn't call ata_dev_get_GTF as that function will use handle to do some ACPI evaluation. Signed-off-by: Aaron Lu Cc: stable@vger.kernel.org --- drivers/ata/libata-acpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 9e69a5308693..b4f7cc2522d9 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -835,6 +835,7 @@ void ata_acpi_on_resume(struct ata_port *ap) ata_for_each_dev(dev, &ap->link, ALL) { ata_acpi_clear_gtf(dev); if (ata_dev_enabled(dev) && + ata_dev_acpi_handle(dev) && ata_dev_get_GTF(dev, NULL) >= 0) dev->flags |= ATA_DFLAG_ACPI_PENDING; }