aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>2006-11-08 09:35:54 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 17:23:33 -0500
commit6f07429fa295a04e06c93601e6c597e7a6d95495 (patch)
treec7df5bc91afcff4b46047199869dea286fee9d1d
parent2381526a793582ad18b30af0e3013ccad1a8bcdb (diff)
usb: hid-core free urb cleanup
- usb_free_urb() cleanup Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/input/hid-core.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 2c12b04da111..f7a67c4db515 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -2080,13 +2080,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
2080 return hid; 2080 return hid;
2081 2081
2082fail: 2082fail:
2083 2083 usb_free_urb(hid->urbin);
2084 if (hid->urbin) 2084 usb_free_urb(hid->urbout);
2085 usb_free_urb(hid->urbin); 2085 usb_free_urb(hid->urbctrl);
2086 if (hid->urbout)
2087 usb_free_urb(hid->urbout);
2088 if (hid->urbctrl)
2089 usb_free_urb(hid->urbctrl);
2090 hid_free_buffers(dev, hid); 2086 hid_free_buffers(dev, hid);
2091 hid_free_device(hid); 2087 hid_free_device(hid);
2092 2088
@@ -2117,8 +2113,7 @@ static void hid_disconnect(struct usb_interface *intf)
2117 2113
2118 usb_free_urb(hid->urbin); 2114 usb_free_urb(hid->urbin);
2119 usb_free_urb(hid->urbctrl); 2115 usb_free_urb(hid->urbctrl);
2120 if (hid->urbout) 2116 usb_free_urb(hid->urbout);
2121 usb_free_urb(hid->urbout);
2122 2117
2123 hid_free_buffers(hid->dev, hid); 2118 hid_free_buffers(hid->dev, hid);
2124 hid_free_device(hid); 2119 hid_free_device(hid);