From 4cd2a58ebc17f6053cef5d406ab14b66a2206bf5 Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Sat, 28 Apr 2007 14:07:32 +0800
Subject: [PATCH] --- yaml --- r: 56833 b: refs/heads/master c:
 fcbd963912acc0c5d51bb27f8654f2a91fcff322 h: refs/heads/master i:   56831:
 d641ca083d62e25aba6c30065b1ec4ebcecc2ebb v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/usb/gadget/fsl_usb2_udc.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 900cb0c2c275..006e9ab7f869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa
+refs/heads/master: fcbd963912acc0c5d51bb27f8654f2a91fcff322
diff --git a/trunk/drivers/usb/gadget/fsl_usb2_udc.c b/trunk/drivers/usb/gadget/fsl_usb2_udc.c
index 157054ea3978..3ca2b3159f00 100644
--- a/trunk/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/trunk/drivers/usb/gadget/fsl_usb2_udc.c
@@ -228,13 +228,15 @@ static int dr_controller_setup(struct fsl_udc *udc)
 
 	/* Config PHY interface */
 	portctrl = fsl_readl(&dr_regs->portsc1);
-	portctrl &= ~PORTSCX_PHY_TYPE_SEL;
+	portctrl &= ~(PORTSCX_PHY_TYPE_SEL & PORTSCX_PORT_WIDTH);
 	switch (udc->phy_mode) {
 	case FSL_USB2_PHY_ULPI:
 		portctrl |= PORTSCX_PTS_ULPI;
 		break;
-	case FSL_USB2_PHY_UTMI:
 	case FSL_USB2_PHY_UTMI_WIDE:
+		portctrl |= PORTSCX_PTW_16BIT;
+		/* fall through */
+	case FSL_USB2_PHY_UTMI:
 		portctrl |= PORTSCX_PTS_UTMI;
 		break;
 	case FSL_USB2_PHY_SERIAL:
@@ -625,7 +627,7 @@ static void fsl_free_buffer(struct usb_ep *_ep, void *buf,
 	struct fsl_ep *ep;
 
 	if (!_ep)
-		return NULL;
+		return;
 
 	ep = container_of(_ep, struct fsl_ep, ep);