diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-08-13 19:57:03 +0300 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-09-05 12:07:00 -0700 |
| commit | 052c7f9ffb0e95843e75448d02664459253f9ff8 (patch) | |
| tree | 35ab6de105398db0e056520cf27ff5f6870b1d76 /drivers/usb/host/xhci.c | |
| parent | a96874a2a92feaef607ddd3137277a788cb927a6 (diff) | |
| download | op-kernel-dev-052c7f9ffb0e95843e75448d02664459253f9ff8.zip op-kernel-dev-052c7f9ffb0e95843e75448d02664459253f9ff8.tar.gz | |
xhci: Fix a logical vs bitwise AND bug
The intent was to test whether the flag was set.
This patch should be backported to stable kernels as old as 3.0, since
it fixes a bug in commit e95829f474f0db3a4d940cae1423783edd966027 "xhci:
Switch PPT ports to EHCI on shutdown.", which was marked for stable.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index c59d5b5..617b0a7 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -659,7 +659,7 @@ void xhci_shutdown(struct usb_hcd *hcd) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); - if (xhci->quirks && XHCI_SPURIOUS_REBOOT) + if (xhci->quirks & XHCI_SPURIOUS_REBOOT) usb_disable_xhci_ports(to_pci_dev(hcd->self.controller)); spin_lock_irq(&xhci->lock); |
