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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
usb
/
net
/
kaweth.c
diff --git
a/drivers/usb/net/kaweth.c
b/drivers/usb/net/kaweth.c
index
42a248f
..
6eb637a
100644
(file)
--- a/
drivers/usb/net/kaweth.c
+++ b/
drivers/usb/net/kaweth.c
@@
-62,7
+62,7
@@
#include <asm/semaphore.h>
#include <asm/byteorder.h>
#include <asm/semaphore.h>
#include <asm/byteorder.h>
-#
define
DEBUG
+#
undef
DEBUG
#ifdef DEBUG
#define kaweth_dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "\n" ,##arg)
#ifdef DEBUG
#define kaweth_dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "\n" ,##arg)
@@
-592,7
+592,7
@@
static void kaweth_usb_receive(struct urb *urb, struct pt_regs *regs)
struct sk_buff *skb;
struct sk_buff *skb;
- if(unlikely(urb->status == -ECONNRESET || urb->status == -ECONNABORTED))
+ if(unlikely(urb->status == -ECONNRESET || urb->status == -ECONNABORTED
|| urb->status == -ESHUTDOWN
))
/* we are killed - set a flag and wake the disconnect handler */
{
kaweth->end = 1;
/* we are killed - set a flag and wake the disconnect handler */
{
kaweth->end = 1;
@@
-1293,7
+1293,7
@@
static int kaweth_internal_control_msg(struct usb_device *usb_dev,
return -ENOMEM;
usb_fill_control_urb(urb, usb_dev, pipe, (unsigned char*)cmd, data,
return -ENOMEM;
usb_fill_control_urb(urb, usb_dev, pipe, (unsigned char*)cmd, data,
- len, usb_api_blocking_completion,
0
);
+ len, usb_api_blocking_completion,
NULL
);
retv = usb_start_wait_urb(urb, timeout, &length);
if (retv < 0) {
retv = usb_start_wait_urb(urb, timeout, &length);
if (retv < 0) {