diff mbox

wlcore: sdio: check for valid platform device data before suspend

Message ID 1527161730-9044-1-git-send-email-eyalr@ti.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show

Commit Message

Eyal Reizer May 24, 2018, 11:35 a.m. UTC
the wl pointer can be null In case only wlcore_sdio is probed while
no WiLink module is successfully probed, as in the case of mounting a
wl12xx module while using a device tree file configured with wl18xx
related settings.
In this case the system was crashing in wl1271_suspend() as platform
device data is not set.
Make sure wl the pointer is valid before using it.

Signed-off-by: Eyal Reizer <eyalr@ti.com>mamai
---
 drivers/net/wireless/ti/wlcore/sdio.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Tony Lindgren May 24, 2018, 2:24 p.m. UTC | #1
* Eyal Reizer <eyalreizer@gmail.com> [180524 11:38]:
> the wl pointer can be null In case only wlcore_sdio is probed while
> no WiLink module is successfully probed, as in the case of mounting a
> wl12xx module while using a device tree file configured with wl18xx
> related settings.
> In this case the system was crashing in wl1271_suspend() as platform
> device data is not set.
> Make sure wl the pointer is valid before using it.

Just checking.. It seems like this fix is separate from the PM
runtime conversion, right?

> Signed-off-by: Eyal Reizer <eyalr@ti.com>mamai

Looks like you have some extra characters ^^^^^ here.

Regards,

Tony
Reizer, Eyal May 28, 2018, 8:20 a.m. UTC | #2
> > the wl pointer can be null In case only wlcore_sdio is probed while
> > no WiLink module is successfully probed, as in the case of mounting a
> > wl12xx module while using a device tree file configured with wl18xx
> > related settings.
> > In this case the system was crashing in wl1271_suspend() as platform
> > device data is not set.
> > Make sure wl the pointer is valid before using it.
> 
> Just checking.. It seems like this fix is separate from the PM
> runtime conversion, right?

Correct. This is a separate patch/
> 
> > Signed-off-by: Eyal Reizer <eyalr@ti.com>mamai
> 
> Looks like you have some extra characters ^^^^^ here.
> 
Thanks!. Will fix and submit v2

Best Regards,
Eyal
diff mbox

Patch

diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index da701cd..aec6225 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -406,6 +406,11 @@  static int wl1271_suspend(struct device *dev)
 	mmc_pm_flag_t sdio_flags;
 	int ret = 0;
 
+	if (!wl) {
+		dev_err(dev, "no wilink module was probed\n");
+		goto out;
+	}
+
 	dev_dbg(dev, "wl1271 suspend. wow_enabled: %d\n",
 		wl->wow_enabled);