From 0f50fb5ad5d5d79ea7f8989704d0d00ce5502839 Mon Sep 17 00:00:00 2001 From: Henry Ptasinski Date: Wed, 29 Jun 2011 16:46:55 -0700 Subject: [PATCH] --- yaml --- r: 259763 b: refs/heads/master c: 521223a27a760658e04e65d8deaf5339070f15f6 h: refs/heads/master i: 259761: 790b3a4e85271e46dc0aa920474e8f69c7741674 259759: 5d1fc80f965a805c4262c43eb682eca1d76042a7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c6fdd8b9b8eb..b8f01ae12552 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 202a208bd2888b6b72355bb1849f641606da928f +refs/heads/master: 521223a27a760658e04e65d8deaf5339070f15f6 diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 48550f350376..0fae0b1544ee 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -5567,11 +5567,9 @@ static void dhdsdio_release_malloc(dhd_bus_t *bus) if (bus->dhd && bus->dhd->dongle_reset) return; - if (bus->rxbuf) { - kfree(bus->rxbuf); - bus->rxctl = bus->rxbuf = NULL; - bus->rxlen = 0; - } + kfree(bus->rxbuf); + bus->rxctl = bus->rxbuf = NULL; + bus->rxlen = 0; kfree(bus->databuf); bus->databuf = NULL;