Skip to content

Commit

Permalink
staging: vt6656: 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>
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 6403bb7 commit 1d5c536
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/vt6656/firmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ FIRMWAREbDownload(
result = TRUE;

out:
if (pBuffer)
kfree(pBuffer);
kfree(pBuffer);

spin_lock_irq(&pDevice->lock);
return result;
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/vt6656/hostap.c
Original file line number Diff line number Diff line change
Expand Up @@ -858,8 +858,7 @@ int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
}

out:
if (param != NULL)
kfree(param);
kfree(param);

return ret;
}
Expand Down
12 changes: 4 additions & 8 deletions drivers/staging/vt6656/main_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -837,8 +837,7 @@ static void device_free_tx_bufs(PSDevice pDevice)
usb_kill_urb(pTxContext->pUrb);
usb_free_urb(pTxContext->pUrb);
}
if (pTxContext)
kfree(pTxContext);
kfree(pTxContext);
}
return;
}
Expand All @@ -861,8 +860,7 @@ static void device_free_rx_bufs(PSDevice pDevice)
if (pRCB->skb)
dev_kfree_skb(pRCB->skb);
}
if (pDevice->pRCBMem)
kfree(pDevice->pRCBMem);
kfree(pDevice->pRCBMem);

return;
}
Expand All @@ -878,8 +876,7 @@ static void usb_device_reset(PSDevice pDevice)

static void device_free_int_bufs(PSDevice pDevice)
{
if (pDevice->intBuf.pDataBuf != NULL)
kfree(pDevice->intBuf.pDataBuf);
kfree(pDevice->intBuf.pDataBuf);
return;
}

Expand Down Expand Up @@ -1480,8 +1477,7 @@ static unsigned char *Config_FileOperation(PSDevice pDevice)
*/

if(result!=0) {
if(buffer)
kfree(buffer);
kfree(buffer);
buffer=NULL;
}
return buffer;
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/vt6656/wpactl.c
Original file line number Diff line number Diff line change
Expand Up @@ -999,8 +999,7 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p)
}

out:
if (param != NULL)
kfree(param);
kfree(param);

return ret;
}
Expand Down

0 comments on commit 1d5c536

Please sign in to comment.