diff options
| author | Andiry Xu <andiry.xu@amd.com> | 2011-09-23 14:19:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:36:44 -0800 |
| commit | 1c349398c8583d23bdf397363aedaae55d889c03 (patch) | |
| tree | fc109995398e1bbc6acf3ba9876c2b20eee142fa /drivers/usb/host/xhci-ring.c | |
| parent | 567c6a1ce9d9417c33176bb848a6287f5bae6dd4 (diff) | |
| download | kernel_samsung_smdk4412-1c349398c8583d23bdf397363aedaae55d889c03.zip kernel_samsung_smdk4412-1c349398c8583d23bdf397363aedaae55d889c03.tar.gz kernel_samsung_smdk4412-1c349398c8583d23bdf397363aedaae55d889c03.tar.bz2 | |
xHCI: test and clear RWC bit
commit d2f52c9e585bbb1a3c164e02b8dcd0d996c67353 upstream.
Introduce xhci_test_and_clear_bit() to clear RWC bit in PORTSC register.
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index b689397..cbf7ed0 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1347,10 +1347,8 @@ static void handle_port_status(struct xhci_hcd *xhci, xhci_ring_device(xhci, slot_id); xhci_dbg(xhci, "resume SS port %d finished\n", port_id); /* Clear PORT_PLC */ - temp = xhci_readl(xhci, port_array[faked_port_index]); - temp = xhci_port_state_to_neutral(temp); - temp |= PORT_PLC; - xhci_writel(xhci, temp, port_array[faked_port_index]); + xhci_test_and_clear_bit(xhci, port_array, + faked_port_index, PORT_PLC); } else { xhci_dbg(xhci, "resume HS port %d\n", port_id); bus_state->resume_done[faked_port_index] = jiffies + |