diff options
| author |   Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2011-09-13 16:41:10 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-20 12:33:49 -0700 |
| commit | d78265992425ccb5753db9c56d9703c91b963e4b (patch) | |
| tree | 15123f4bc7c2dfd56559cbd4bba6165ebec70e94 /drivers/usb/host | |
| parent | USB: Realtek cr: Fix driver freeze issue (diff) | |
| download | linux-dev-d78265992425ccb5753db9c56d9703c91b963e4b.tar.xz linux-dev-d78265992425ccb5753db9c56d9703c91b963e4b.zip | |
usb/xhci: ignore xhci version while checking for the link quirk
instead of reading the xhci interface version each time _even_ if the
quirk is not required, simply check if the quirk flag is set. This flag
is only set of the module parameter is set and here is where I moved the
version check to.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
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')
| -rw-r--r-- | drivers/usb/host/xhci.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index dd0dc15680b6..7583b24c3387 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -316,7 +316,7 @@ int xhci_init(struct usb_hcd *hcd) xhci_dbg(xhci, "xhci_init\n"); spin_lock_init(&xhci->lock); - if (link_quirk) { + if (xhci->hci_version == 0x95 && link_quirk) { xhci_dbg(xhci, "QUIRK: Not clearing Link TRB chain bits.\n"); xhci->quirks |= XHCI_LINK_TRB_QUIRK; } else { diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index b224b20b0784..13f1c23ed19d 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1526,9 +1526,7 @@ static inline void xhci_write_64(struct xhci_hcd *xhci, static inline int xhci_link_trb_quirk(struct xhci_hcd *xhci) { - u32 temp = xhci_readl(xhci, &xhci->cap_regs->hc_capbase); - return ((HC_VERSION(temp) == 0x95) && - (xhci->quirks & XHCI_LINK_TRB_QUIRK)); + return xhci->quirks & XHCI_LINK_TRB_QUIRK; } /* xHCI debugging */ |