lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] zd1211rw: usb_clear_halt not allowed in IRQ context

Browse Source 
We will reimplement halt-clearing later, when we have periodic
housekeeping routines in place. This will do as a temporary fix, the
EPIPE case has not yet been seen.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Daniel Drake
2006-07-05 15:57:39 +01:00
committed by John W. Linville
parent 522536f6b2
commit b312d799b3
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/zd1211rw/zd_usb.c
View File

@@ -375,10 +375,8 @@ static void int_urb_complete(struct urb *urb, struct pt_regs *pt_regs)
case -ENODEV: case -ENODEV:
case -ENOENT: case -ENOENT:
case -ECONNRESET: case -ECONNRESET:
goto kfree;
case -EPIPE: case -EPIPE:
usb_clear_halt(urb->dev, EP_INT_IN); goto kfree;
/* FALL-THROUGH */
default: default:
goto resubmit; goto resubmit;
} }
@@ -580,10 +578,8 @@ static void rx_urb_complete(struct urb *urb, struct pt_regs *pt_regs)
case -ENODEV: case -ENODEV:
case -ENOENT: case -ENOENT:
case -ECONNRESET: case -ECONNRESET:
return;
case -EPIPE: case -EPIPE:
usb_clear_halt(urb->dev, EP_DATA_IN); return;
/* FALL-THROUGH */
default: default:
dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status); dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);
goto resubmit; goto resubmit;
@@ -749,11 +745,9 @@ static void tx_urb_complete(struct urb *urb, struct pt_regs *pt_regs)
case -ENODEV: case -ENODEV:
case -ENOENT: case -ENOENT:
case -ECONNRESET: case -ECONNRESET:
case -EPIPE:
dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status); dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);
break; break;
case -EPIPE:
usb_clear_halt(urb->dev, EP_DATA_OUT);
/* FALL-THROUGH */
default: default:
dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status); dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);
goto resubmit; goto resubmit;