USB: gadget: dummy_hcd.c: fix nested switch statements (9063ff44) · Commits · e / devices / android_kernel_sony_msm8994

Fix a messed up combination of two nested switch statements in drivers/usb/gadget/dummy_hcd.c. According to the USB spec (section 5.8.3) the maximum packet size for bulk endpoints can be 512 for high-speed devices and 8, 16, 32 or 64 for full-speed devices. Low-speed devices must not have bulk endpoints. Signed-off-by:

Ingo van Lil <inguin@gmx.de> Cc: David Brownell <david-b@pacbell.net> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Acked-by:

Alan Stern <stern@rowland.harvard.edu> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/gadget/dummy_hcd.c

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -365,17 +365,15 @@ dummy_enable (struct usb_ep _ep, const struct usb_endpoint_descriptor desc)
	case USB_SPEED_HIGH:		case USB_SPEED_HIGH:
	if (max == 512)		if (max == 512)
	break;		break;
	/* conserve return statements */		goto done;
	default:		case USB_SPEED_FULL:
	switch (max) {		if (max == 8 \|\| max == 16 \|\| max == 32 \|\| max == 64)
	case 8: case 16: case 32: case 64:
	/* we'll fake any legal size */		/* we'll fake any legal size */
	break;		break;
			/* save a return statement */
	default:		default:
	case USB_SPEED_LOW:
	goto done;		goto done;
	}		}
	}
	break;		break;
	case USB_ENDPOINT_XFER_INT:		case USB_ENDPOINT_XFER_INT:
	if (strstr (ep->ep.name, "-iso")) /* bulk is ok */		if (strstr (ep->ep.name, "-iso")) /* bulk is ok */