From linux-usb-devel-bounces@lists.sourceforge.net Wed Nov 8 06:37:05 2006 From: Mariusz Kozlowski To: Andrew Morton Date: Wed, 8 Nov 2006 15:35:54 +0100 MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200611081535.55651.m.kozlowski@tuxland.pl> Cc: Greg KH , linux-kernel@vger.kernel.org, linux-usb-devel@lists.sourceforge.net Subject: usb: hid-core free urb cleanup Content-Type: text/plain; charset="us-ascii" - usb_free_urb() cleanup Signed-off-by: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman --- drivers/usb/input/hid-core.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) --- gregkh-2.6.orig/drivers/usb/input/hid-core.c +++ gregkh-2.6/drivers/usb/input/hid-core.c @@ -2080,13 +2080,9 @@ static struct hid_device *usb_hid_config 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_in 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);