diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 12:54:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 12:54:16 -0500 |
commit | 479b46b5599b1e610630d7332e168c1f9c4ee0b4 (patch) | |
tree | c5d7e48576f5b5b6a61a2a2e5f85abaa941b85ab /drivers/usb/host/ohci-q.c | |
parent | ce1fd3585709e833ad102167024e97217734dbfd (diff) |
Revert "USB host: Move AMD PLL quirk to pci-quirks.c"
This reverts commit b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25.
It conflicts with commit baab93afc2844b68d57b0dcca5e1d34c5d7cf411 "USB:
EHCI: ASPM quirk of ISOC on AMD Hudson" and merging the two just doesn't
work properly.
Cc: Andiry Xu <andiry.xu@amd.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alex He <alex.he@amd.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ohci-q.c')
-rw-r--r-- | drivers/usb/host/ohci-q.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index dd24fc115e48..83094d067e0f 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
@@ -52,7 +52,7 @@ __acquires(ohci->lock) | |||
52 | ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; | 52 | ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; |
53 | if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) { | 53 | if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) { |
54 | if (quirk_amdiso(ohci)) | 54 | if (quirk_amdiso(ohci)) |
55 | usb_amd_quirk_pll_enable(); | 55 | quirk_amd_pll(1); |
56 | if (quirk_amdprefetch(ohci)) | 56 | if (quirk_amdprefetch(ohci)) |
57 | sb800_prefetch(ohci, 0); | 57 | sb800_prefetch(ohci, 0); |
58 | } | 58 | } |
@@ -686,7 +686,7 @@ static void td_submit_urb ( | |||
686 | } | 686 | } |
687 | if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) { | 687 | if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) { |
688 | if (quirk_amdiso(ohci)) | 688 | if (quirk_amdiso(ohci)) |
689 | usb_amd_quirk_pll_disable(); | 689 | quirk_amd_pll(0); |
690 | if (quirk_amdprefetch(ohci)) | 690 | if (quirk_amdprefetch(ohci)) |
691 | sb800_prefetch(ohci, 1); | 691 | sb800_prefetch(ohci, 1); |
692 | } | 692 | } |