From c132e07a73abe111c2e94df4aa6de9dcb4778649 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 24 Feb 2012 09:22:27 +0300 Subject: [PATCH] --- yaml --- r: 290730 b: refs/heads/master c: d4ca00992ce0809e8cfdc452aa3f972e3be72654 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3eae16304ae1..9d01b73625b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06d9b6ac75379297c6a47ee8b8d0fe8b5cedcd39 +refs/heads/master: d4ca00992ce0809e8cfdc452aa3f972e3be72654 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 934ed782620c..7c54d1db4a44 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -482,7 +482,7 @@ static void brcmf_usb_free_q(struct list_head *q, bool pending) struct brcmf_usbreq *req, *next; int i = 0; list_for_each_entry_safe(req, next, q, list) { - if (!req || !req->urb) { + if (!req->urb) { brcmf_dbg(ERROR, "bad req\n"); break; } @@ -712,12 +712,12 @@ static int brcmf_usb_up(struct device *dev) struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev); u16 ifnum; - if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP) - return 0; - if (devinfo == NULL) return -EINVAL; + if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP) + return 0; + /* If the USB/HSIC bus in sleep state, wake it up */ if (devinfo->suspend_state == USBOS_SUSPEND_STATE_SUSPENDED) { if (brcmf_usb_pnp(devinfo, BCMFMAC_USB_PNP_RESUME) != 0) {