Merge branch 'master' into tk71

[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..598e7e2ab80c666f1395f1db6c30aaa44f34d646 100644 (file)
--- a/drivers/usb/gadget/f_hid.c
+++ b/drivers/usb/gadget/f_hid.c
@@ -25,7 +25,6 @@
 #include <linux/cdev.h>
 #include <linux/mutex.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/uaccess.h>
 #include <linux/wait.h>
 #include <linux/usb/g_hid.h>
@@ -318,8 +317,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 +410,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)
@@ -451,6 +446,7 @@ const struct file_operations f_hidg_fops = {
        .write          = f_hidg_write,
        .read           = f_hidg_read,
        .poll           = f_hidg_poll,
+       .llseek         = noop_llseek,
 };
 
 static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)