From 2a3aa6f38aabe7a4a82883c70e24c83d070ed66e Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Tue, 12 May 2009 13:50:34 -0700
Subject: [PATCH] --- yaml --- r: 151372 b: refs/heads/master c:
 1e0abb7e1844a7cb499321a94d5d04347ef86d68 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/gadget/imx_udc.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a5620eb7256a..a7f8a5464657 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5512966643adb17483efc5f61481a38fc33088bb
+refs/heads/master: 1e0abb7e1844a7cb499321a94d5d04347ef86d68
diff --git a/trunk/drivers/usb/gadget/imx_udc.c b/trunk/drivers/usb/gadget/imx_udc.c
index 168658b4b4e2..239bf8ed9f4a 100644
--- a/trunk/drivers/usb/gadget/imx_udc.c
+++ b/trunk/drivers/usb/gadget/imx_udc.c
@@ -734,9 +734,12 @@ static struct usb_request *imx_ep_alloc_request
 {
 	struct imx_request *req;
 
+	if (!usb_ep)
+		return NULL;
+
 	req = kzalloc(sizeof *req, gfp_flags);
-	if (!req || !usb_ep)
-		return 0;
+	if (!req)
+		return NULL;
 
 	INIT_LIST_HEAD(&req->queue);
 	req->in_use = 0;