| Message ID | 1419162233-19492-3-git-send-email-arend@broadcom.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kalle Valo |
| Headers | show |
On 12/21/14 12:43, Arend van Spriel wrote: > From: Hante Meuleman<meuleman@broadcom.com> > > With the introduction of WOWL for SDIO a possible dereference of a > NULL pointer got introduced. Found by static checker. Kalle, Can you drop this patch and take the one from Mika instead with Message-ID: 1419346112-173303-1-git-send-email-mika.westerberg@linux.intel.com [1] Regards, Arend [1] http://mid.gmane.org/1419346112-173303-1-git-send-email-mika.westerberg@linux.intel.com > Reported-by: Dan Carpenter<dan.carpenter@oracle.com> > Reviewed-by: Arend Van Spriel<arend@broadcom.com> > Reviewed-by: Pieter-Paul Giesberts<pieterpg@broadcom.com> > Signed-off-by: Hante Meuleman<meuleman@broadcom.com> > Signed-off-by: Arend van Spriel<arend@broadcom.com> > --- > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > index 3c06e93..9583dcd 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > @@ -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 > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c index 3c06e93..9583dcd 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c @@ -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