Merge branch 'master' into for-next

[mv-sheeva.git] / drivers / usb / gadget / f_hid.c

diff --git a/drivers/usb/gadget/f_hid.c b/drivers/usb/gadget/f_hid.c
index 53e120208e990c5a423b76dfa5578b5991aabf17..111b85ca7ac0971d8edc029aa8e5e5d53cac1656 100644 (file)
--- a/drivers/usb/gadget/f_hid.c
+++ b/drivers/usb/gadget/f_hid.c
@@ -318,8 +318,6 @@ static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req)
        spin_unlock(&hidg->spinlock);
 
        wake_up(&hidg->read_queue);
-
-       return;
 }
 
 static int hidg_setup(struct usb_function *f,
@@ -413,8 +411,6 @@ static void hidg_disable(struct usb_function *f)
 
        usb_ep_disable(hidg->in_ep);
        hidg->in_ep->driver_data = NULL;
-
-       return;
 }
 
 static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)