From e6d9450e79deab321db2bba05e2ca7202dd3cba5 Mon Sep 17 00:00:00 2001 From: Kai Liu Date: Mon, 21 May 2018 15:44:29 +0800 Subject: [PATCH] qcacld-3.0: Check if sdio device is valid before start wifi When loading sdio driver, need make sure sdio device is recognized, break driver loading if no device. Change-Id: I4d47575d793b58970012e4e47cc63b0c197f565d CRs-Fixed: 2245495 --- core/pld/src/pld_sdio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/pld/src/pld_sdio.c b/core/pld/src/pld_sdio.c index 74884667f8cb..004743b22641 100644 --- a/core/pld/src/pld_sdio.c +++ b/core/pld/src/pld_sdio.c @@ -75,15 +75,16 @@ static int pld_sdio_probe(struct sdio_func *sdio_func, const struct sdio_device_id *id) { struct pld_context *pld_context; - struct device *dev = &sdio_func->dev; - int ret = 0; + struct device *dev; + int ret; pld_context = pld_get_global_context(); - if (!pld_context) { + if (!pld_context || !sdio_func) { ret = -ENODEV; goto out; } + dev = &sdio_func->dev; ret = pld_add_dev(pld_context, dev, PLD_BUS_TYPE_SDIO); if (ret) goto out;