git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
inode.c
diff --git
a/drivers/usb/gadget/inode.c
b/drivers/usb/gadget/inode.c
index
3f1d771
..
d1d72d9
100644
(file)
--- a/
drivers/usb/gadget/inode.c
+++ b/
drivers/usb/gadget/inode.c
@@
-1774,7
+1774,6
@@
static struct usb_gadget_driver gadgetfs_driver = {
.speed = USB_SPEED_FULL,
#endif
.function = (char *) driver_desc,
.speed = USB_SPEED_FULL,
#endif
.function = (char *) driver_desc,
- .bind = gadgetfs_bind,
.unbind = gadgetfs_unbind,
.setup = gadgetfs_setup,
.disconnect = gadgetfs_disconnect,
.unbind = gadgetfs_unbind,
.setup = gadgetfs_setup,
.disconnect = gadgetfs_disconnect,
@@
-1797,7
+1796,6
@@
static int gadgetfs_probe (struct usb_gadget *gadget)
static struct usb_gadget_driver probe_driver = {
.speed = USB_SPEED_HIGH,
static struct usb_gadget_driver probe_driver = {
.speed = USB_SPEED_HIGH,
- .bind = gadgetfs_probe,
.unbind = gadgetfs_nop,
.setup = (void *)gadgetfs_nop,
.disconnect = gadgetfs_nop,
.unbind = gadgetfs_nop,
.setup = (void *)gadgetfs_nop,
.disconnect = gadgetfs_nop,
@@
-1907,7
+1905,7
@@
dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
/* triggers gadgetfs_bind(); then we can enumerate. */
spin_unlock_irq (&dev->lock);
/* triggers gadgetfs_bind(); then we can enumerate. */
spin_unlock_irq (&dev->lock);
- value = usb_gadget_
register_driver (&gadgetfs_driver
);
+ value = usb_gadget_
probe_driver(&gadgetfs_driver, gadgetfs_bind
);
if (value != 0) {
kfree (dev->buf);
dev->buf = NULL;
if (value != 0) {
kfree (dev->buf);
dev->buf = NULL;
@@
-2046,7
+2044,7
@@
gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
return -ESRCH;
/* fake probe to determine $CHIP */
return -ESRCH;
/* fake probe to determine $CHIP */
- (void) usb_gadget_
register_driver (&probe_driver
);
+ (void) usb_gadget_
probe_driver(&probe_driver, gadgetfs_probe
);
if (!CHIP)
return -ENODEV;
if (!CHIP)
return -ENODEV;