diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 18:52:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 18:52:57 -0700 |
| commit | 22c7fdf4a7acfa24d9d498b1357e6c07d0e6c553 (patch) | |
| tree | 040ce9c55cb285c5eff565942f313a07e157fbb2 /drivers/usb | |
| parent | 5423b2ed25993e13009ce39f55d742c3c6d03edb (diff) | |
| parent | 86b89eed9aca2a4a335b9c1bf7380f9183db431f (diff) | |
Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index 2622b6596d7..3712b925b31 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c @@ -932,7 +932,7 @@ static struct ehci_qh *qh_append_tds ( list_del (&qtd->qtd_list); list_add (&dummy->qtd_list, qtd_list); - __list_splice (qtd_list, qh->qtd_list.prev); + list_splice_tail(qtd_list, &qh->qtd_list); ehci_qtd_init(ehci, qtd, qtd->qtd_dma); qh->dummy = qtd; |