diff options
author | Oliver Neukum <oneukum@suse.de> | 2014-05-14 08:00:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 18:57:32 -0400 |
commit | 85f4e45b11e5d351789e09c259620d037246f6d8 (patch) | |
tree | 0cf9cc5fc2dfc0739c3f7b723e774dc89eb50258 /drivers/usb/host | |
parent | 2d87bbd634b0fe5aa2285fd2a095867158fb2cc3 (diff) |
xhci: unified loggig of RESET_ON_RESUME
Either we log for all chips we set the quirk for or for
none. This patch reports it for all chips.
Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci-pci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 35d447780707..ffd119eb3e29 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c | |||
@@ -140,8 +140,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) | |||
140 | if (pdev->vendor == PCI_VENDOR_ID_ETRON && | 140 | if (pdev->vendor == PCI_VENDOR_ID_ETRON && |
141 | pdev->device == PCI_DEVICE_ID_ASROCK_P67) { | 141 | pdev->device == PCI_DEVICE_ID_ASROCK_P67) { |
142 | xhci->quirks |= XHCI_RESET_ON_RESUME; | 142 | xhci->quirks |= XHCI_RESET_ON_RESUME; |
143 | xhci_dbg_trace(xhci, trace_xhci_dbg_quirks, | ||
144 | "QUIRK: Resetting on resume"); | ||
145 | xhci->quirks |= XHCI_TRUST_TX_LENGTH; | 143 | xhci->quirks |= XHCI_TRUST_TX_LENGTH; |
146 | } | 144 | } |
147 | if (pdev->vendor == PCI_VENDOR_ID_RENESAS && | 145 | if (pdev->vendor == PCI_VENDOR_ID_RENESAS && |
@@ -149,6 +147,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) | |||
149 | xhci->quirks |= XHCI_RESET_ON_RESUME; | 147 | xhci->quirks |= XHCI_RESET_ON_RESUME; |
150 | if (pdev->vendor == PCI_VENDOR_ID_VIA) | 148 | if (pdev->vendor == PCI_VENDOR_ID_VIA) |
151 | xhci->quirks |= XHCI_RESET_ON_RESUME; | 149 | xhci->quirks |= XHCI_RESET_ON_RESUME; |
150 | |||
151 | if (xhci->quirks & XHCI_RESET_ON_RESUME) | ||
152 | xhci_dbg_trace(xhci, trace_xhci_dbg_quirks, | ||
153 | "QUIRK: Resetting on resume"); | ||
152 | } | 154 | } |
153 | 155 | ||
154 | /* called during probe() after chip reset completes */ | 156 | /* called during probe() after chip reset completes */ |