summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2014-11-08 15:34:07 -0800
committerAdam Williamson <awilliam@redhat.com>2014-11-08 15:34:07 -0800
commita2d7a54b90ef3d379c3bbb12b4b0e959dab27b14 (patch)
tree33f45c130b0819136f8671562af2bce906760ea2
parent54fd44e88b6ac3a9bf79ff07a96df87900b437bd (diff)
downloadkernel-a2d7a54b90ef3d379c3bbb12b4b0e959dab27b14.tar.gz
kernel-a2d7a54b90ef3d379c3bbb12b4b0e959dab27b14.tar.xz
kernel-a2d7a54b90ef3d379c3bbb12b4b0e959dab27b14.zip
add patch from JMB to (hopefully) fix V8P wifi
-rw-r--r--kernel.spec4
-rw-r--r--sdhci-pm.patch25
2 files changed, 29 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index ce6c3952d..bef100461 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -644,6 +644,9 @@ Patch31012: soc_button_use_leftmeta.patch
# from Jan-Michael Brummer
Patch31013: rt5640_enable_mic.patch
+# Fix wifi on V8P(?) from Jan-Michael Brummer
+Patch31014: sdhci-pm.patch
+
# END OF AWB PATCH DEFINITIONS
# END OF PATCH DEFINITIONS
@@ -1386,6 +1389,7 @@ ApplyPatch RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-bat
ApplyPatch support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
#ApplyPatch rt5640_enable_mic.patch
ApplyPatch soc_button_use_leftmeta.patch
+ApplyPatch sdhci-pm.patch
# END OF AWB (BAYTRAIL) PATCH APPLICATIONS
diff --git a/sdhci-pm.patch b/sdhci-pm.patch
new file mode 100644
index 000000000..62ba0e6fd
--- /dev/null
+++ b/sdhci-pm.patch
@@ -0,0 +1,25 @@
+diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
+index ada1a3e..306b4ac 100644
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -1715,7 +1715,8 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
+ struct sdhci_host *host = mmc_priv(mmc);
+ unsigned long flags;
+
+- sdhci_runtime_pm_get(host);
++ if (enable)
++ sdhci_runtime_pm_get(host);
+
+ spin_lock_irqsave(&host->lock, flags);
+ if (enable)
+@@ -1726,7 +1727,8 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
+ sdhci_enable_sdio_irq_nolock(host, enable);
+ spin_unlock_irqrestore(&host->lock, flags);
+
+- sdhci_runtime_pm_put(host);
++ if (!enable)
++ sdhci_runtime_pm_put(host);
+ }
+
+ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host,
+ \ No newline at end of file