diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-08-13 19:57:03 +0300 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-01-31 02:31:37 -0800 |
| commit | 52c35f1e3681e18362714c2621f7b024e76c35aa (patch) | |
| tree | a47572fbf8614b7adc6b15971f6be09e92ea5105 /drivers/usb | |
| parent | ab2b8cb0ce94868c1a3d6a177dabd07e789ca456 (diff) | |
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.
Change-Id: I084865f97fdc38d8966b49c92eafe51d7cc660a6
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
Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Reviewed-on: http://git-master/r/190499
(cherry picked from commit e54abee5308040fabddedae314626a5bd2f1da08)
Signed-off-by: JC Kuo <jckuo@nvidia.com>
Change-Id: I589666284acb505742cae7bf5d7f5ccb32252146
Reviewed-on: http://git-master/r/194689
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ajay Gupta <ajayg@nvidia.com>
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
Diffstat (limited to 'drivers/usb')
| -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 b859a7d6adac..f5dc94f61926 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); |