aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-05-13 17:48:41 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-17 11:37:57 -0700
commit17fb76165f307f7be2cfbc93958356fe50fa4791 (patch)
tree9f7903607e16c01f670f1a20ac8b354663734fdb /drivers/staging/vt6656
parent7ed2911c8f727077249fc5170a1ab842465aef21 (diff)
downloadkernel_samsung_smdk4412-17fb76165f307f7be2cfbc93958356fe50fa4791.zip
kernel_samsung_smdk4412-17fb76165f307f7be2cfbc93958356fe50fa4791.tar.gz
kernel_samsung_smdk4412-17fb76165f307f7be2cfbc93958356fe50fa4791.tar.bz2
drivers/staging/vt6656/main_usb.c: Delete unnecessary call to usb_kill_urb
Since in each case nothing has been done with the recently allocated urb, it is not necessary to kill it before freeing it. The semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression urb; statement S; position p1,p2; @@ urb = usb_alloc_urb@p1(...); ... when != urb if (urb == NULL) S ... when != urb usb_kill_urb@p2(urb); @other exists@ position r.p1,r.p2; @@ ... when != usb_alloc_urb@p1(...) usb_kill_urb@p2(...); @depends on !other exists@ expression urb; position r.p1,r.p2; @@ urb = usb_alloc_urb@p1(...); ... ( -usb_kill_urb@p2(urb); +usb_free_urb(urb); ... when != urb | -usb_kill_urb@p2(urb); ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r--drivers/staging/vt6656/main_usb.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 9a8eaf1..e18efd4 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -955,7 +955,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) {
pDevice->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC);
if (pDevice->pInterruptURB == NULL) {
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int urb\n");
- usb_kill_urb(pDevice->pControlURB);
usb_free_urb(pDevice->pControlURB);
goto free_rx_tx;
}
@@ -963,8 +962,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) {
pDevice->intBuf.pDataBuf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
if (pDevice->intBuf.pDataBuf == NULL) {
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int buf\n");
- usb_kill_urb(pDevice->pControlURB);
- usb_kill_urb(pDevice->pInterruptURB);
usb_free_urb(pDevice->pControlURB);
usb_free_urb(pDevice->pInterruptURB);
goto free_rx_tx;