Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8975842b authored by Mika Westerberg's avatar Mika Westerberg Committed by Kalle Valo
Browse files

brcmfmac: Do not crash if platform data is not populated 



The driver looks for pdata->oob_irq_supported to find out if wowl can be
supported. However, not all platforms populate pdata in which case we crash
the kernel because of NULL pointer dereference.

Fixes: 330b4e4b ("brcmfmac: Add wowl support for SDIO devices.")
Reported-by: default avatarChristophe Prigent <christophe.prigent@intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent dddd6022

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	 */

	if ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_KEEP_POWER) &&

	    ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_WAKE_SDIO_IRQ) ||

	     (sdiodev->pdata->oob_irq_supported)))

	     (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)))

		bus_if->wowl_supported = true;

#endif
@@ -1167,7 +1167,7 @@ static int brcmf_ops_sdio_resume(struct device *dev) 
	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;



	brcmf_dbg(SDIO, "Enter\n");

	if (sdiodev->pdata->oob_irq_supported)

	if (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)

		disable_irq_wake(sdiodev->pdata->oob_irq_nr);

	brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS);

	atomic_set(&sdiodev->suspend, false);