| From 34b1ba6ee45abbfa5e20955806ba46d3cd3bd665 Mon Sep 17 00:00:00 2001 |
| From: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Date: Mon, 23 Jan 2017 14:19:51 +0200 |
| Subject: [PATCH 182/255] xhci: simplify if statement to make it more readable |
| |
| No functional change, De Morgan !(A && B) = (!A || !B) |
| |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 505f581c48bc27cd72beb42df47b3012b617ea5c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-ring.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -916,7 +916,8 @@ void xhci_stop_endpoint_command_watchdog |
| spin_lock_irqsave(&xhci->lock, flags); |
| |
| ep->stop_cmds_pending--; |
| - if (!(ep->stop_cmds_pending == 0 && (ep->ep_state & EP_HALT_PENDING))) { |
| + |
| + if (ep->stop_cmds_pending || !(ep->ep_state & EP_HALT_PENDING)) { |
| xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, |
| "Stop EP timer ran, but no command pending, " |
| "exiting."); |
