Skip to content

Commit

Permalink
staging: ath6kl: Remove NULL check before kfree
Browse files Browse the repository at this point in the history
This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ilia Mirkin authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent 459d2ea commit 4dd5381
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
4 changes: 1 addition & 3 deletions drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
Original file line number Diff line number Diff line change
Expand Up @@ -1214,9 +1214,7 @@ delHifDevice(HIF_DEVICE * device)
{
AR_DEBUG_ASSERT(device!= NULL);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: delHifDevice; 0x%p\n", device));
if (device->dma_buffer != NULL) {
kfree(device->dma_buffer);
}
kfree(device->dma_buffer);
kfree(device);
}

Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/ath6kl/os/linux/ar6000_android.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ int logger_write(const enum logidx index,
}
set_fs(oldfs);
out_free_message:
if (msg) {
kfree(msg);
}
kfree(msg);
return ret;
}
#endif
Expand Down
6 changes: 2 additions & 4 deletions drivers/staging/ath6kl/os/linux/ar6k_pal.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,8 @@ static void bt_cleanup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo)
}
}

if (pHciPalInfo->hdev != NULL) {
kfree(pHciPalInfo->hdev);
pHciPalInfo->hdev = NULL;
}
kfree(pHciPalInfo->hdev);
pHciPalInfo->hdev = NULL;
}

/*********************************************************
Expand Down
6 changes: 2 additions & 4 deletions drivers/staging/ath6kl/os/linux/hci_bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,10 +929,8 @@ static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
}
}

if (pHcidevInfo->pBtStackHCIDev != NULL) {
kfree(pHcidevInfo->pBtStackHCIDev);
pHcidevInfo->pBtStackHCIDev = NULL;
}
kfree(pHcidevInfo->pBtStackHCIDev);
pHcidevInfo->pBtStackHCIDev = NULL;
}

static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
Expand Down

0 comments on commit 4dd5381

Please sign in to comment.