diff options
Diffstat (limited to 'patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch index f0b85444..ab956828 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c -@@ -71,7 +71,7 @@ static bool +@@ -70,7 +70,7 @@ static bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) { bool is_err = false; @@ -9,7 +9,7 @@ is_err = atomic_read(&sdiodev->suspend); #endif return is_err; -@@ -80,7 +80,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ +@@ -79,7 +79,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ static void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) { @@ -18,7 +18,7 @@ int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -546,7 +546,7 @@ static void brcmf_ops_sdio_remove(struct +@@ -516,7 +516,7 @@ static void brcmf_ops_sdio_remove(struct brcmf_dbg(SDIO, "Exit\n"); } @@ -27,9 +27,9 @@ static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -596,7 +596,7 @@ static struct sdio_driver brcmf_sdmmc_dr +@@ -566,7 +566,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, - .name = "brcmfmac", + .name = BRCMFMAC_SDIO_PDATA_NAME, .id_table = brcmf_sdmmc_ids, -#ifdef CONFIG_PM_SLEEP +#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) |