Commit 7be306f0 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] USB: usb gadgetfs, handle omap_udc

Tell gadgetfs about omap_udc.
Add some missing __user annotations.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent d90c9ecc
...@@ -253,6 +253,10 @@ static void put_ep (struct ep_data *data) ...@@ -253,6 +253,10 @@ static void put_ep (struct ep_data *data)
#define CHIP "goku_udc" #define CHIP "goku_udc"
#endif #endif
#ifdef CONFIG_USB_GADGET_OMAP
#define CHIP "omap_udc"
#endif
#ifdef CONFIG_USB_GADGET_SA1100 #ifdef CONFIG_USB_GADGET_SA1100
#define CHIP "sa1100" #define CHIP "sa1100"
#endif #endif
...@@ -737,7 +741,7 @@ static struct file_operations ep_io_operations = { ...@@ -737,7 +741,7 @@ static struct file_operations ep_io_operations = {
* speed descriptor, then optional high speed descriptor. * speed descriptor, then optional high speed descriptor.
*/ */
static ssize_t 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 ep_data *data = fd->private_data;
struct usb_ep *ep; struct usb_ep *ep;
...@@ -944,7 +948,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len) ...@@ -944,7 +948,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
} }
static ssize_t 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; struct dev_data *dev = fd->private_data;
ssize_t retval; ssize_t retval;
...@@ -1125,7 +1129,7 @@ next_event (struct dev_data *dev, enum usb_gadgetfs_event_type type) ...@@ -1125,7 +1129,7 @@ next_event (struct dev_data *dev, enum usb_gadgetfs_event_type type)
} }
static ssize_t 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; struct dev_data *dev = fd->private_data;
ssize_t retval = -ESRCH; ssize_t retval = -ESRCH;
...@@ -1763,7 +1767,7 @@ static int is_valid_config (struct usb_config_descriptor *config) ...@@ -1763,7 +1767,7 @@ static int is_valid_config (struct usb_config_descriptor *config)
} }
static ssize_t 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; struct dev_data *dev = fd->private_data;
ssize_t value = len, length = len; ssize_t value = len, length = len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment