The patch below does not apply to the 3.13-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From 945be38caa287b177b8c17ffaae7754cab6a658f Mon Sep 17 00:00:00 2001
From: Adrian Hunter <[email protected]>
Date: Tue, 21 Jan 2014 09:52:39 +0200
Subject: [PATCH] mmc: sdhci-pci: Fix possibility of chip->fixes being null

It is possible for chip->fixes to be null.  Check before dereferencing it.

Signed-off-by: Adrian Hunter <[email protected]>
Cc: stable <[email protected]> # 3.11+
Signed-off-by: Chris Ball <[email protected]>

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 92e6e81b4de2..0955777b6c7e 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -1378,7 +1378,8 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
         * from runtime suspend.  If it is not there, don't allow runtime PM.
         * Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure.
         */
-       if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid(slot->cd_gpio))
+       if (chip->fixes && chip->fixes->own_cd_for_runtime_pm &&
+           !gpio_is_valid(slot->cd_gpio))
                chip->allow_runtime_pm = false;
 
        return slot;

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to