xhci: Fix conditional check in bandwidth calculation.
authorSarah Sharp <sarah.a.sharp@linux.intel.com>
Thu, 25 Oct 2012 20:44:12 +0000 (13:44 -0700)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Mon, 12 Nov 2012 19:45:26 +0000 (11:45 -0800)
commit392a07ae3316f2b90b39ce41e66d6f6b5c95de90
tree630fa9c82ac60ce6f51bf0fedeaa40c3d0abd6b0
parent2611bd189ee8cb6761393aec90d699015d9c5e9f
xhci: Fix conditional check in bandwidth calculation.

David reports that at drivers/usb/host/xhci.c:2257:

static bool xhci_is_sync_in_ep(unsigned int ep_type)
{
    return (ep_type == ISOC_IN_EP || ep_type != INT_IN_EP);
}

The static analyser cppcheck says

[linux-3.7-rc2/drivers/usb/host/xhci.c:2257]: (style) Redundant condition: If ep_type == 5, the comparison ep_type != 7 is always true.

Maybe the original programmer intention was something like

static bool xhci_is_sync_in_ep(unsigned int ep_type)
{
    return (ep_type == ISOC_IN_EP || ep_type == INT_IN_EP);
}

Fix this.

This patch should be backported to stable kernels as old as 3.2, that
contain the commit 2b69899934c63b7b9432568584fb4c4a2924f40c "xhci: USB
3.0 BW checking."

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-by: David Binderman <dcb314@hotmail.com>
Cc: stable@vger.kernel.org
drivers/usb/host/xhci.c