-------- Original Message --------
Subject: [PATCH 2.6.7] usb gadgetfs, handle omap_udc
Date: Sun, 11 Jul 2004 13:37:21 -0700
From: David Brownell <[EMAIL PROTECTED]>
To: Greg KH <[EMAIL PROTECTED]>, [EMAIL PROTECTED]
Adds a new UDC, and also some sparse annotations.
Please merge.
- Dave
p.s. Note: the patch to change kiocb.private to
a pointer will break the current gadgetfs on
some platforms; separate patch forthcoming.
(That's why when changing a member type, it's
best to change its name too.)
Tell gadgetfs about omap_udc.
Add some missing __user annotations.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
--- a/drivers/usb/gadget/inode.c Sat Jul 10 12:40:59 2004
+++ b/drivers/usb/gadget/inode.c Sat Jul 10 12:40:59 2004
@@ -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;