diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/net/wireless/zd1201.c | |
parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/wireless/zd1201.c')
-rw-r--r-- | drivers/net/wireless/zd1201.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index a44dda952c67..80af9a9fcbb3 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -119,7 +119,7 @@ static void zd1201_usbfree(struct urb *urb, struct pt_regs *regs) | |||
119 | switch(urb->status) { | 119 | switch(urb->status) { |
120 | case -EILSEQ: | 120 | case -EILSEQ: |
121 | case -ENODEV: | 121 | case -ENODEV: |
122 | case -ETIMEDOUT: | 122 | case -ETIME: |
123 | case -ENOENT: | 123 | case -ENOENT: |
124 | case -EPIPE: | 124 | case -EPIPE: |
125 | case -EOVERFLOW: | 125 | case -EOVERFLOW: |
@@ -201,7 +201,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) | |||
201 | switch(urb->status) { | 201 | switch(urb->status) { |
202 | case -EILSEQ: | 202 | case -EILSEQ: |
203 | case -ENODEV: | 203 | case -ENODEV: |
204 | case -ETIMEDOUT: | 204 | case -ETIME: |
205 | case -ENOENT: | 205 | case -ENOENT: |
206 | case -EPIPE: | 206 | case -EPIPE: |
207 | case -EOVERFLOW: | 207 | case -EOVERFLOW: |