From: Greg Kroah-Hartman Date: Tue, 11 Feb 2014 18:45:29 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.80~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a4e8ccf73b599b8f3c02318fa0f9062f649b13d;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..dec82174509 --- /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 +Date: Tue, 21 Jan 2014 09:52:39 +0200 +Subject: mmc: sdhci-pci: Fix possibility of chip->fixes being null + +From: Adrian Hunter + +commit 945be38caa287b177b8c17ffaae7754cab6a658f upstream. + +It is possible for chip->fixes to be null. Check before dereferencing it. + +Signed-off-by: Adrian Hunter +Signed-off-by: Chris Ball +Signed-off-by: Greg Kroah-Hartman + +--- + 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 216437de977..124ac00b8ce 100644 --- 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