1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 6e7393460ead..0a1f2b52a12f 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -877,9 +877,9 @@ fail:
         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);
 }