| From 052c7f9ffb0e95843e75448d02664459253f9ff8 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Mon, 13 Aug 2012 19:57:03 +0300 |
| Subject: xhci: Fix a logical vs bitwise AND bug |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| commit 052c7f9ffb0e95843e75448d02664459253f9ff8 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/xhci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -594,7 +594,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); |
