aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/whci/qset.c
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2009-06-24 13:26:40 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-23 09:46:21 -0400
commit831baa4915de465357b25c471bbb9b36472024df (patch)
treeb28e8365e77defb84ba1437993b64be753274ead /drivers/usb/host/whci/qset.c
parent586dfc8cafc25cf785332fdfe9530f392e26f30d (diff)
USB: whci-hcd: make endpoint_reset method async
usb_hcd_endpoint_reset() may be called in atomic context and must not sleep. So make whci-hcd's endpoint_reset() asynchronous. URBs submitted while the reset is in progress will be queued (on the std list) and transfers will resume once the reset is complete. Signed-off-by: David Vrabel <david.vrabel@csr.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/whci/qset.c')
-rw-r--r--drivers/usb/host/whci/qset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index 640b38fbd051..1b9dc1571570 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -103,7 +103,6 @@ static void qset_fill_qh(struct whc_qset *qset, struct urb *urb)
103void qset_clear(struct whc *whc, struct whc_qset *qset) 103void qset_clear(struct whc *whc, struct whc_qset *qset)
104{ 104{
105 qset->td_start = qset->td_end = qset->ntds = 0; 105 qset->td_start = qset->td_end = qset->ntds = 0;
106 qset->remove = 0;
107 106
108 qset->qh.link = cpu_to_le32(QH_LINK_NTDS(8) | QH_LINK_T); 107 qset->qh.link = cpu_to_le32(QH_LINK_NTDS(8) | QH_LINK_T);
109 qset->qh.status = qset->qh.status & QH_STATUS_SEQ_MASK; 108 qset->qh.status = qset->qh.status & QH_STATUS_SEQ_MASK;
@@ -125,7 +124,7 @@ void qset_clear(struct whc *whc, struct whc_qset *qset)
125 */ 124 */
126void qset_reset(struct whc *whc, struct whc_qset *qset) 125void qset_reset(struct whc *whc, struct whc_qset *qset)
127{ 126{
128 wait_for_completion(&qset->remove_complete); 127 qset->reset = 0;
129 128
130 qset->qh.status &= ~QH_STATUS_SEQ_MASK; 129 qset->qh.status &= ~QH_STATUS_SEQ_MASK;
131 qset->qh.cur_window = cpu_to_le32((1 << qset->max_burst) - 1); 130 qset->qh.cur_window = cpu_to_le32((1 << qset->max_burst) - 1);
@@ -156,6 +155,7 @@ struct whc_qset *get_qset(struct whc *whc, struct urb *urb,
156 155
157void qset_remove_complete(struct whc *whc, struct whc_qset *qset) 156void qset_remove_complete(struct whc *whc, struct whc_qset *qset)
158{ 157{
158 qset->remove = 0;
159 list_del_init(&qset->list_node); 159 list_del_init(&qset->list_node);
160 complete(&qset->remove_complete); 160 complete(&qset->remove_complete);
161} 161}