diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2007-11-08 12:28:27 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2007-11-08 12:28:27 +0000 |
commit | cda3dc3ae1a21fb9c1e8729d2fcc84967e42dd2b (patch) | |
tree | 7405ae8f7dd7e736698d9047438081029b6ef147 /target/linux/adm5120/files/drivers/usb/host/adm5120-q.c | |
parent | 64e1a619c22e12d3fe9d30699a2baf4842501892 (diff) | |
download | upstream-cda3dc3ae1a21fb9c1e8729d2fcc84967e42dd2b.tar.gz upstream-cda3dc3ae1a21fb9c1e8729d2fcc84967e42dd2b.tar.bz2 upstream-cda3dc3ae1a21fb9c1e8729d2fcc84967e42dd2b.zip |
USB driver fixes
SVN-Revision: 9513
Diffstat (limited to 'target/linux/adm5120/files/drivers/usb/host/adm5120-q.c')
-rw-r--r-- | target/linux/adm5120/files/drivers/usb/host/adm5120-q.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c index 2eafecc4fa..a9e002e7d3 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c @@ -153,7 +153,6 @@ static int ed_schedule(struct admhcd *ahcd, struct ed *ed) ed->state = ED_IDLE; - admhc_dma_lock(ahcd); ed->hwINFO &= ~cpu_to_hc32(ahcd, ED_SKIP); old_tail = ahcd->ed_tails[ed->type]; @@ -169,7 +168,6 @@ static int ed_schedule(struct admhcd *ahcd, struct ed *ed) old_tail->hwNextED = cpu_to_hc32(ahcd, ed->dma); ahcd->ed_tails[ed->type] = ed; - admhc_dma_unlock(ahcd); admhc_intr_enable(ahcd, ADMHC_INTR_SOFI); @@ -181,9 +179,7 @@ static void ed_deschedule(struct admhcd *ahcd, struct ed *ed) admhc_dump_ed(ahcd, "ED-DESCHED", ed, 0); /* remove this ED from the HC list */ - admhc_dma_lock(ahcd); ed->ed_prev->hwNextED = ed->hwNextED; - admhc_dma_unlock(ahcd); /* and remove it from our list */ ed->ed_prev->ed_next = ed->ed_next; @@ -203,9 +199,7 @@ static void ed_start_deschedule(struct admhcd *ahcd, struct ed *ed) { admhc_dump_ed(ahcd, "ED-UNLINK", ed, 0); - admhc_dma_lock(ahcd); ed->hwINFO |= cpu_to_hc32(ahcd, ED_SKIP); - admhc_dma_unlock(ahcd); ed->state = ED_UNLINK; @@ -573,11 +567,9 @@ static int ed_next_urb(struct admhcd *ahcd, struct ed *ed) up->td[up->td_cnt-1]->hwNextTD = cpu_to_hc32(ahcd, ed->dummy->td_dma); - admhc_dma_lock(ahcd); carry = hc32_to_cpup(ahcd, &ed->hwHeadP) & ED_C; ed->hwHeadP = cpu_to_hc32(ahcd, up->td[0]->td_dma | carry); ed->hwINFO &= ~cpu_to_hc32(ahcd, ED_SKIP); - admhc_dma_unlock(ahcd); return 1; } |