From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbdBYRYQ (ORCPT ); Sat, 25 Feb 2017 12:24:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58546 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbdBYRYF (ORCPT ); Sat, 25 Feb 2017 12:24:05 -0500 From: Hans de Goede To: Adrian Hunter , Ulf Hansson , Jean Delvare Cc: Hans de Goede , Takashi Iwai , "russianneuromancer @ ya . ru" , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] mmc: sdhci-acpi: Check device status before calling fix_up_power() Date: Sat, 25 Feb 2017 18:23:56 +0100 Message-Id: <20170225172357.26294-3-hdegoede@redhat.com> In-Reply-To: <20170225172357.26294-1-hdegoede@redhat.com> References: <20170225172357.26294-1-hdegoede@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sat, 25 Feb 2017 17:24:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calling acpi_device_fix_up_power() on a device which is not present is not a good idea. While at it also call acpi_bus_get_status() on the children before the status check to make sure that child->status contains valid data. Signed-off-by: Hans de Goede --- drivers/mmc/host/sdhci-acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 96465ff..873beae 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -394,15 +394,15 @@ static int sdhci_acpi_probe(struct platform_device *pdev) if (acpi_bus_get_device(handle, &device)) return -ENODEV; + if (acpi_bus_get_status(device) || !device->status.present) + return -ENODEV; + /* Power on the SDHCI controller and its children */ acpi_device_fix_up_power(device); list_for_each_entry(child, &device->children, node) if (child->status.present && child->status.enabled) acpi_device_fix_up_power(child); - if (acpi_bus_get_status(device) || !device->status.present) - return -ENODEV; - if (sdhci_acpi_byt_defer(dev)) return -EPROBE_DEFER; -- 2.9.3