diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-11-08 15:35:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 14:23:33 -0800 |
| commit | 6f07429fa295a04e06c93601e6c597e7a6d95495 (patch) | |
| tree | c7df5bc91afcff4b46047199869dea286fee9d1d | |
| parent | 2381526a793582ad18b30af0e3013ccad1a8bcdb (diff) | |
| download | linux-6f07429fa295a04e06c93601e6c597e7a6d95495.tar.bz2 | |
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.c | 13 |
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) return hid; fail: - - if (hid->urbin) - usb_free_urb(hid->urbin); - if (hid->urbout) - usb_free_urb(hid->urbout); - if (hid->urbctrl) - usb_free_urb(hid->urbctrl); + usb_free_urb(hid->urbin); + usb_free_urb(hid->urbout); + usb_free_urb(hid->urbctrl); hid_free_buffers(dev, hid); hid_free_device(hid); @@ -2117,8 +2113,7 @@ static void hid_disconnect(struct usb_interface *intf) usb_free_urb(hid->urbin); usb_free_urb(hid->urbctrl); - if (hid->urbout) - usb_free_urb(hid->urbout); + usb_free_urb(hid->urbout); hid_free_buffers(hid->dev, hid); hid_free_device(hid); |