* [PATCH] drivers/staging/vt6656/main_usb.c: Delete unnecessary call to usb_kill_urb
@ 2011-05-13 15:48 Julia Lawall
0 siblings, 0 replies; only message in thread
From: Julia Lawall @ 2011-05-13 15:48 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: kernel-janitors, Andres More, devel, linux-kernel
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>
---
drivers/staging/vt6656/main_usb.c | 3 ---
1 file changed, 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-13 15:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-13 15:48 [PATCH] drivers/staging/vt6656/main_usb.c: Delete unnecessary call to usb_kill_urb Julia Lawall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®