Skip to content

Commit

Permalink
brcm80211: fmac: fix a couple checking after dereference bugs
Browse files Browse the repository at this point in the history
There were two dereferencing before checking for NULL static checker
complaints in this new file.  The list cursor is never NULL so that
check can be removed.  I moved the other dereference after the check.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Dan Carpenter authored and John W. Linville committed Feb 27, 2012
1 parent 06d9b6a commit d4ca009
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/wireless/brcm80211/brcmfmac/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit d4ca009

Please sign in to comment.