Commit 392a07ae authored Oct 25, 2012 by Sarah Sharp

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 2b698999 "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

parent 2611bd18

drivers/usb/host/xhci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2255,7 +2255,7 @@ static bool xhci_is_async_ep(unsigned int ep_type)

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

		static unsigned int xhci_get_ss_bw_consumed(struct xhci_bw_info *ep_bw)