diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 14:10:19 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 14:10:19 -0400 |
| commit | c4fb0a4162f3bcf93f369b44e4c8b7e09538ece6 (patch) | |
| tree | 2817fb79819ea739a7a9ecc5284802dc8fc9a0d5 | |
| parent | 59013d3dc2285eecf98016dca78cd50aabdd8069 (diff) | |
| download | longterm-queue-4.12-c4fb0a4162f3bcf93f369b44e4c8b7e09538ece6.tar.gz | |
ath10k: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ath10k-fix-build-errors-with-CONFIG_PM.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch b/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch index 6207c7a..e3d290d 100644 --- a/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch +++ b/queue/ath10k-fix-build-errors-with-CONFIG_PM.patch @@ -1,4 +1,4 @@ -From 20665a9076d48e9abd9a2db13d307f58f7ef6647 Mon Sep 17 00:00:00 2001 +From 5bd5ecc04c2816b0600a26c9437e9c7184706823 Mon Sep 17 00:00:00 2001 From: Brian Norris <briannorris@chromium.org> Date: Thu, 19 Oct 2017 11:45:19 -0700 Subject: [PATCH] ath10k: fix build errors with !CONFIG_PM @@ -41,12 +41,13 @@ Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but Fixes: 096ad2a15fd8 ("Merge branch 'ath-next'") Signed-off-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c -index b18a9b690df4..d790ea20b95d 100644 +index 1e9806f57ee4..0736d1cff6db 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c -@@ -2577,8 +2577,6 @@ void ath10k_pci_hif_power_down(struct ath10k *ar) +@@ -2553,8 +2553,6 @@ void ath10k_pci_hif_power_down(struct ath10k *ar) */ } @@ -54,8 +55,8 @@ index b18a9b690df4..d790ea20b95d 100644 - static int ath10k_pci_hif_suspend(struct ath10k *ar) { - /* Nothing to do; the important stuff is in the driver suspend. */ -@@ -2627,7 +2625,6 @@ static int ath10k_pci_resume(struct ath10k *ar) + /* The grace timer can still be counting down and ar->ps_awake be true. +@@ -2591,7 +2589,6 @@ static int ath10k_pci_hif_resume(struct ath10k *ar) return ret; } @@ -63,7 +64,7 @@ index b18a9b690df4..d790ea20b95d 100644 static bool ath10k_pci_validate_cal(void *data, size_t size) { -@@ -2782,10 +2779,8 @@ static const struct ath10k_hif_ops ath10k_pci_hif_ops = { +@@ -2746,10 +2743,8 @@ static const struct ath10k_hif_ops ath10k_pci_hif_ops = { .power_down = ath10k_pci_hif_power_down, .read32 = ath10k_pci_read32, .write32 = ath10k_pci_write32, |