From 6cef4970b9a96e7b3703ea3723f7225ca8b2ba8b Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Wed, 1 Aug 2007 12:32:27 +0200 Subject: [PATCH] --- yaml --- r: 63570 b: refs/heads/master c: 22f675f320f721e9eaa2bbf7b883316b408c6c8f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e58b1a4e1c66..4dcc815310ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cda5ecf80bad94b4113722f037af818e7453dd2d +refs/heads/master: 22f675f320f721e9eaa2bbf7b883316b408c6c8f diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/drivers/hid/usbhid/hid-core.c index 6e7393460ead..0a1f2b52a12f 100644 --- a/trunk/drivers/hid/usbhid/hid-core.c +++ b/trunk/drivers/hid/usbhid/hid-core.c @@ -877,9 +877,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) usb_free_urb(usbhid->urbin); usb_free_urb(usbhid->urbout); usb_free_urb(usbhid->urbctrl); + hid_free_buffers(dev, hid); kfree(usbhid); fail_no_usbhid: - hid_free_buffers(dev, hid); hid_free_device(hid); return NULL; @@ -913,9 +913,9 @@ static void hid_disconnect(struct usb_interface *intf) usb_free_urb(usbhid->urbin); usb_free_urb(usbhid->urbctrl); usb_free_urb(usbhid->urbout); - kfree(usbhid); hid_free_buffers(hid_to_usb_dev(hid), hid); + kfree(usbhid); hid_free_device(hid); }