Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236452
b: refs/heads/master
c: 46d994b
h: refs/heads/master
v: v3
  • Loading branch information
Ilia Mirkin authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent c73d1ef commit af532ab
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 56 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23c32986870b4abb5b426d3399a4cbd43948e37c
refs/heads/master: 46d994b1f5b481c7f0a77edece270cf253db84c9
3 changes: 1 addition & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,7 @@ int dhd_prot_attach(dhd_pub_t *dhd)
return 0;

fail:
if (cdc != NULL)
kfree(cdc);
kfree(cdc);
return BCME_NOMEM;
}

Expand Down
9 changes: 3 additions & 6 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,8 +996,7 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable,
__func__, arg, rc));

fail:
if (arg_org)
kfree(arg_org);
kfree(arg_org);
}

void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
Expand Down Expand Up @@ -1132,11 +1131,9 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
__func__, arg));

fail:
if (arg_org)
kfree(arg_org);
kfree(arg_org);

if (buf)
kfree(buf);
kfree(buf);
}

void dhd_arp_offload_set(dhd_pub_t *dhd, int arp_mode)
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1777,8 +1777,7 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
bcmerror = -EFAULT;
}

if (buf)
kfree(buf);
kfree(buf);

if (bcmerror > 0)
bcmerror = 0;
Expand Down
24 changes: 8 additions & 16 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1930,10 +1930,8 @@ static int dhdsdio_checkdied(dhd_bus_t *bus, u8 *data, uint size)
#endif /* DHD_DEBUG */

done:
if (mbuffer)
kfree(mbuffer);
if (str)
kfree(str);
kfree(mbuffer);
kfree(str);

return bcmerror;
}
Expand Down Expand Up @@ -1962,8 +1960,7 @@ static int dhdsdio_mem_dump(dhd_bus_t *bus)
ret = dhdsdio_membytes(bus, false, start, databuf, read_size);
if (ret) {
DHD_ERROR(("%s: Error membytes %d\n", __func__, ret));
if (buf)
kfree(buf);
kfree(buf);
return -1;
}
printk(".");
Expand Down Expand Up @@ -2081,8 +2078,7 @@ int dhdsdio_downloadvars(dhd_bus_t *bus, void *arg, int len)
}

/* Free the old ones and replace with passed variables */
if (bus->vars)
kfree(bus->vars);
kfree(bus->vars);

bus->vars = kmalloc(len, GFP_ATOMIC);
bus->varsz = bus->vars ? len : 0;
Expand Down Expand Up @@ -5541,10 +5537,8 @@ static void dhdsdio_release_malloc(dhd_bus_t *bus)
bus->rxlen = 0;
}

if (bus->databuf) {
kfree(bus->databuf);
bus->databuf = NULL;
}
kfree(bus->databuf);
bus->databuf = NULL;
}

static void dhdsdio_release_dongle(dhd_bus_t *bus)
Expand Down Expand Up @@ -5732,8 +5726,7 @@ static int dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path)
}

err:
if (memblock)
kfree(memblock);
kfree(memblock);

if (image)
dhd_os_close_image(image);
Expand Down Expand Up @@ -5872,8 +5865,7 @@ static int dhdsdio_download_nvram(struct dhd_bus *bus)
}

err:
if (memblock)
kfree(memblock);
kfree(memblock);

if (image)
dhd_os_close_image(image);
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,7 @@ wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars
return &pi->pubpi_ro;

err:
if (pi)
kfree(pi);
kfree(pi);
return NULL;
}

Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
Original file line number Diff line number Diff line change
Expand Up @@ -22383,8 +22383,7 @@ wlc_phy_gen_load_samples_nphy(phy_info_t *pi, u32 f_kHz, u16 max_val,

wlc_phy_loadsampletable_nphy(pi, tone_buf, num_samps);

if (tone_buf != NULL)
kfree(tone_buf);
kfree(tone_buf);

return num_samps;
}
Expand Down Expand Up @@ -22431,8 +22430,7 @@ wlc_phy_loadsampletable_nphy(phy_info_t *pi, cs32 *tone_buf,
wlc_phy_table_write_nphy(pi, NPHY_TBL_ID_SAMPLEPLAY, num_samps, 0, 32,
data_buf);

if (data_buf != NULL)
kfree(data_buf);
kfree(data_buf);

if (pi->phyhang_avoid)
wlc_phy_stay_in_carriersearch_nphy(pi, false);
Expand Down
9 changes: 3 additions & 6 deletions trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1379,8 +1379,7 @@ static void wl_free(struct wl_info *wl)
for (t = wl->timers; t; t = next) {
next = t->next;
#ifdef BCMDBG
if (t->name)
kfree(t->name);
kfree(t->name);
#endif
kfree(t);
}
Expand Down Expand Up @@ -1716,8 +1715,7 @@ void wl_free_timer(struct wl_info *wl, struct wl_timer *t)
if (wl->timers == t) {
wl->timers = wl->timers->next;
#ifdef BCMDBG
if (t->name)
kfree(t->name);
kfree(t->name);
#endif
kfree(t);
return;
Expand All @@ -1729,8 +1727,7 @@ void wl_free_timer(struct wl_info *wl, struct wl_timer *t)
if (tmp->next == t) {
tmp->next = t->next;
#ifdef BCMDBG
if (t->name)
kfree(t->name);
kfree(t->name);
#endif
kfree(t);
return;
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2160,10 +2160,8 @@ uint wlc_detach(struct wlc_info *wlc)


#ifdef BCMDBG
if (wlc->country_ie_override) {
kfree(wlc->country_ie_override);
wlc->country_ie_override = NULL;
}
kfree(wlc->country_ie_override);
wlc->country_ie_override = NULL;
#endif /* BCMDBG */

{
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/brcm80211/util/bcmotp.c
Original file line number Diff line number Diff line change
Expand Up @@ -830,8 +830,7 @@ static int hndotp_nvread(void *oh, char *data, uint *len)
*len = offset;

out:
if (rawotp)
kfree(rawotp);
kfree(rawotp);
si_setcoreidx(oi->sih, idx);

return rc;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/brcm80211/util/bcmsrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1527,8 +1527,7 @@ static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz)

memcpy(buf, otp, bufsz);

if (otp)
kfree(otp);
kfree(otp);

/* Check CRC */
if (buf[0] == 0xffff) {
Expand Down
14 changes: 5 additions & 9 deletions trunk/drivers/staging/brcm80211/util/hnddma.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,21 +559,17 @@ static void _dma_detach(dma_info_t *di)
(di->rxdpaorig));

/* free packet pointer vectors */
if (di->txp)
kfree((void *)di->txp);
if (di->rxp)
kfree((void *)di->rxp);
kfree(di->txp);
kfree(di->rxp);

/* free tx packet DMA handles */
if (di->txp_dmah)
kfree(di->txp_dmah);
kfree(di->txp_dmah);

/* free rx packet DMA handles */
if (di->rxp_dmah)
kfree(di->rxp_dmah);
kfree(di->rxp_dmah);

/* free our private info structure */
kfree((void *)di);
kfree(di);

}

Expand Down

0 comments on commit af532ab

Please sign in to comment.