3.12-stable patches

added patches:
	mmc-sdhci-pci-fix-possibility-of-chip-fixes-being-null.patch

diff --git a/queue-3.12/mmc-sdhci-pci-fix-possibility-of-chip-fixes-being-null.patch b/queue-3.12/mmc-sdhci-pci-fix-possibility-of-chip-fixes-being-null.patch
new file mode 100644 (file)
index 0000000..dec8217
--- /dev/null
+++ b/queue-3.12/mmc-sdhci-pci-fix-possibility-of-chip-fixes-being-null.patch
@@ -0,0 +1,31 @@
+From 945be38caa287b177b8c17ffaae7754cab6a658f Mon Sep 17 00:00:00 2001
+From: Adrian Hunter <adrian.hunter@intel.com>
+Date: Tue, 21 Jan 2014 09:52:39 +0200
+Subject: mmc: sdhci-pci: Fix possibility of chip->fixes being null
+
+From: Adrian Hunter <adrian.hunter@intel.com>
+
+commit 945be38caa287b177b8c17ffaae7754cab6a658f upstream.
+
+It is possible for chip->fixes to be null.  Check before dereferencing it.
+
+Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
+Signed-off-by: Chris Ball <chris@printf.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mmc/host/sdhci-pci.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/sdhci-pci.c
++++ b/drivers/mmc/host/sdhci-pci.c
+@@ -1389,7 +1389,8 @@ static struct sdhci_pci_slot *sdhci_pci_
+        * 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;

diff --git a/queue-3.12/series b/queue-3.12/series
index 216437de977180b183cd4f4842ef5a91bee151c0..124ac00b8ce6739b0a2b7cf4bd880b01c36b0c6e 100644 (file)
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -104,3 +104,4 @@ timekeeping-fix-clock_tai-timer-nanosleep-delays.patch
 timekeeping-fix-missing-timekeeping_update-in-suspend-path.patch
 rtc-cmos-add-an-alarm-disable-quirk.patch
 mmc-sdhci-pci-fix-byt-sd-card-getting-stuck-in-runtime-suspend.patch
+mmc-sdhci-pci-fix-possibility-of-chip-fixes-being-null.patch