diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:54:22 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:54:22 +0000 |
| commit | a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c (patch) | |
| tree | 56ab507e1df59cae1f57c2f5883bc676f1147441 /drivers/usb/host/whci/asl.c | |
| parent | a23e66f3b8cfdedec14541e71ef29a754870a20c (diff) | |
| download | linux-a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c.tar.gz linux-a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c.tar.bz2 linux-a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c.zip | |
wusb: timeout when waiting for ASL/PZL updates in whci-hcd
Timeout if an ASL or PZL update doesn't not complete and reset the
hardware.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Diffstat (limited to 'drivers/usb/host/whci/asl.c')
| -rw-r--r-- | drivers/usb/host/whci/asl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c index 577c0d29849d..2291c5f5af51 100644 --- a/drivers/usb/host/whci/asl.c +++ b/drivers/usb/host/whci/asl.c @@ -170,12 +170,17 @@ void asl_stop(struct whc *whc) void asl_update(struct whc *whc, uint32_t wusbcmd) { struct wusbhc *wusbhc = &whc->wusbhc; + long t; mutex_lock(&wusbhc->mutex); if (wusbhc->active) { whc_write_wusbcmd(whc, wusbcmd, wusbcmd); - wait_event(whc->async_list_wq, - (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0); + t = wait_event_timeout( + whc->async_list_wq, + (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0, + msecs_to_jiffies(1000)); + if (t == 0) + whc_hw_error(whc, "ASL update timeout"); } mutex_unlock(&wusbhc->mutex); } |