summaryrefslogtreecommitdiff
path: root/drivers/isdn
diff options
context:
space:
mode:
authorMarina Makienko <makienko@ispras.ru>2013-02-25 22:26:50 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-26 17:33:56 -0500
commit114a6f8b52163c0232fbcd7f3808ff04dc61a9b5 (patch)
tree43e58fd3d355599e7b9fd1612eea0b1ab55e3d9c /drivers/isdn
parent6c8c4e4c24b9f6cee3d356a51e4a7f2af787a49b (diff)
downloadlinux-3.10-114a6f8b52163c0232fbcd7f3808ff04dc61a9b5.tar.gz
linux-3.10-114a6f8b52163c0232fbcd7f3808ff04dc61a9b5.tar.bz2
linux-3.10-114a6f8b52163c0232fbcd7f3808ff04dc61a9b5.zip
isdn: hisax: add missing usb_free_urb
Add missing usb_free_urb() on failure path in st5481_setup_usb(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Marina Makienko <makienko@ispras.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hisax/st5481_usb.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 017c67ea3f4..ead0a4fb744 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -294,13 +294,13 @@ int st5481_setup_usb(struct st5481_adapter *adapter)
// Allocate URBs and buffers for interrupt endpoint
urb = usb_alloc_urb(0, GFP_KERNEL);
if (!urb) {
- return -ENOMEM;
+ goto err1;
}
intr->urb = urb;
buf = kmalloc(INT_PKT_SIZE, GFP_KERNEL);
if (!buf) {
- return -ENOMEM;
+ goto err2;
}
endpoint = &altsetting->endpoint[EP_INT-1];
@@ -313,6 +313,14 @@ int st5481_setup_usb(struct st5481_adapter *adapter)
endpoint->desc.bInterval);
return 0;
+err2:
+ usb_free_urb(intr->urb);
+ intr->urb = NULL;
+err1:
+ usb_free_urb(ctrl->urb);
+ ctrl->urb = NULL;
+
+ return -ENOMEM;
}
/*