From: Marek Vasut <marex@denx.de>
Date: Wed, 10 Jul 2013 01:16:33 +0000 (+0200)
Subject: usb: mv_udc: Clean up the initial variable check
X-Git-Tag: v2013.10-rc1~53^2~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d76630386d59d203ad4594d7e91be1f2e258ab93;p=oweals%2Fu-boot.git

usb: mv_udc: Clean up the initial variable check

Clean up the code that checks the validity of a USB gadget driver
in usb_gadget_register_driver(). Moreover, limit the speed of the
driver to either FULL or HIGH, this is more precise and once we
have xHCI support, also more correct.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Lei Wen <leiwen@marvell.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
---

diff --git a/drivers/usb/gadget/mv_udc.c b/drivers/usb/gadget/mv_udc.c
index 6d69d6d568..bed589820a 100644
--- a/drivers/usb/gadget/mv_udc.c
+++ b/drivers/usb/gadget/mv_udc.c
@@ -471,13 +471,12 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 	struct mv_udc *udc;
 	int ret;
 
-	if (!driver
-			|| driver->speed < USB_SPEED_FULL
-			|| !driver->bind
-			|| !driver->setup) {
-		DBG("bad parameter.\n");
+	if (!driver)
+		return -EINVAL;
+	if (!driver->bind || !driver->setup || !driver->disconnect)
+		return -EINVAL;
+	if (driver->speed != USB_SPEED_FULL && driver->speed != USB_SPEED_HIGH)
 		return -EINVAL;
-	}
 
 	ret = usb_lowlevel_init(0, (void **)&controller.ctrl);
 	if (ret)