ChangeSet 1.1757.66.22, 2004/07/14 14:59:45-07:00, david-b@pacbell.net [PATCH] USB: usb gadgetfs, handle omap_udc Tell gadgetfs about omap_udc. Add some missing __user annotations. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman drivers/usb/gadget/inode.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff -Nru a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c --- a/drivers/usb/gadget/inode.c 2004-07-14 16:44:26 -07:00 +++ b/drivers/usb/gadget/inode.c 2004-07-14 16:44:26 -07:00 @@ -253,6 +253,10 @@ #define CHIP "goku_udc" #endif +#ifdef CONFIG_USB_GADGET_OMAP +#define CHIP "omap_udc" +#endif + #ifdef CONFIG_USB_GADGET_SA1100 #define CHIP "sa1100" #endif @@ -737,7 +741,7 @@ * speed descriptor, then optional high speed descriptor. */ static ssize_t -ep_config (struct file *fd, const char *buf, size_t len, loff_t *ptr) +ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) { struct ep_data *data = fd->private_data; struct usb_ep *ep; @@ -944,7 +948,7 @@ } static ssize_t -ep0_read (struct file *fd, char *buf, size_t len, loff_t *ptr) +ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr) { struct dev_data *dev = fd->private_data; ssize_t retval; @@ -1125,7 +1129,7 @@ } static ssize_t -ep0_write (struct file *fd, const char *buf, size_t len, loff_t *ptr) +ep0_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) { struct dev_data *dev = fd->private_data; ssize_t retval = -ESRCH; @@ -1763,7 +1767,7 @@ } static ssize_t -dev_config (struct file *fd, const char *buf, size_t len, loff_t *ptr) +dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) { struct dev_data *dev = fd->private_data; ssize_t value = len, length = len;