git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
usb
/
gadget
/
zero.c
diff --git
a/drivers/usb/gadget/zero.c
b/drivers/usb/gadget/zero.c
index
ae7a1c0
..
40710ea
100644
(file)
--- a/
drivers/usb/gadget/zero.c
+++ b/
drivers/usb/gadget/zero.c
@@
-62,7
+62,6
@@
#define DEBUG 1
// #define VERBOSE
#define DEBUG 1
// #define VERBOSE
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/delay.h>
@@
-572,9
+571,10
@@
static void source_sink_complete (struct usb_ep *ep, struct usb_request *req)
switch (status) {
case 0: /* normal completion? */
switch (status) {
case 0: /* normal completion? */
- if (ep == dev->out_ep)
+ if (ep == dev->out_ep)
{
check_read_data (dev, ep, req);
check_read_data (dev, ep, req);
- else
+ memset (req->buf, 0x55, req->length);
+ } else
reinit_write_data (dev, ep, req);
break;
reinit_write_data (dev, ep, req);
break;
@@
-626,6
+626,8
@@
source_sink_start_ep (struct usb_ep *ep, gfp_t gfp_flags)
if (strcmp (ep->name, EP_IN_NAME) == 0)
reinit_write_data (ep->driver_data, ep, req);
if (strcmp (ep->name, EP_IN_NAME) == 0)
reinit_write_data (ep->driver_data, ep, req);
+ else
+ memset (req->buf, 0x55, req->length);
status = usb_ep_queue (ep, req, gfp_flags);
if (status) {
status = usb_ep_queue (ep, req, gfp_flags);
if (status) {
@@
-1119,7
+1121,7
@@
zero_autoresume (unsigned long _dev)
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-static void
+static void
/* __init_or_exit */
zero_unbind (struct usb_gadget *gadget)
{
struct zero_dev *dev = get_gadget_data (gadget);
zero_unbind (struct usb_gadget *gadget)
{
struct zero_dev *dev = get_gadget_data (gadget);
@@
-1136,7
+1138,7
@@
zero_unbind (struct usb_gadget *gadget)
set_gadget_data (gadget, NULL);
}
set_gadget_data (gadget, NULL);
}
-static int
+static int
__init
zero_bind (struct usb_gadget *gadget)
{
struct zero_dev *dev;
zero_bind (struct usb_gadget *gadget)
{
struct zero_dev *dev;
@@
-1188,10
+1190,9
@@
autoconf_fail:
/* ok, we made sense of the hardware ... */
/* ok, we made sense of the hardware ... */
- dev = k
malloc (sizeof *dev, SLAB
_KERNEL);
+ dev = k
zalloc(sizeof(*dev), GFP
_KERNEL);
if (!dev)
return -ENOMEM;
if (!dev)
return -ENOMEM;
- memset (dev, 0, sizeof *dev);
spin_lock_init (&dev->lock);
dev->gadget = gadget;
set_gadget_data (gadget, dev);
spin_lock_init (&dev->lock);
dev->gadget = gadget;
set_gadget_data (gadget, dev);
@@
-1224,12
+1225,6
@@
autoconf_fail:
loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
- if (gadget->is_otg) {
- otg_descriptor.bmAttributes |= USB_OTG_HNP,
- source_sink_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
- loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
- }
-
usb_gadget_set_selfpowered (gadget);
init_timer (&dev->resume);
usb_gadget_set_selfpowered (gadget);
init_timer (&dev->resume);
@@
-1247,7
+1242,7
@@
autoconf_fail:
EP_OUT_NAME, EP_IN_NAME);
snprintf (manufacturer, sizeof manufacturer, "%s %s with %s",
EP_OUT_NAME, EP_IN_NAME);
snprintf (manufacturer, sizeof manufacturer, "%s %s with %s",
-
system_utsname.sysname, system_utsname.
release,
+
init_utsname()->sysname, init_utsname()->
release,
gadget->name);
return 0;
gadget->name);
return 0;
@@
-1294,7
+1289,7
@@
static struct usb_gadget_driver zero_driver = {
#endif
.function = (char *) longname,
.bind = zero_bind,
#endif
.function = (char *) longname,
.bind = zero_bind,
- .unbind =
zero_unbind
,
+ .unbind =
__exit_p(zero_unbind)
,
.setup = zero_setup,
.disconnect = zero_disconnect,
.setup = zero_setup,
.disconnect = zero_disconnect,