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
[PATCH] namespaces: utsname: use init_utsname when appropriate
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
zero.c
diff --git
a/drivers/usb/gadget/zero.c
b/drivers/usb/gadget/zero.c
index
51424f6
..
0f809dd
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
__exit
+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);
@@
-1240,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;