From 09bfeaa251a64ac1ecf8948f4e9c0006d828152b Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Tue, 29 May 2012 14:36:42 +0300 Subject: [PATCH] --- yaml --- r: 316892 b: refs/heads/master c: 70617db7ad7395498e6bc54c634199bf895426c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/omap_udc.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index add447df49f2..447ad49ffa5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc1737cdd75b692dbdec0e0e22439a0ce1089488 +refs/heads/master: 70617db7ad7395498e6bc54c634199bf895426c6 diff --git a/trunk/drivers/usb/gadget/omap_udc.c b/trunk/drivers/usb/gadget/omap_udc.c index 814aafbed000..f13bcdc75676 100644 --- a/trunk/drivers/usb/gadget/omap_udc.c +++ b/trunk/drivers/usb/gadget/omap_udc.c @@ -268,10 +268,12 @@ omap_alloc_request(struct usb_ep *ep, gfp_t gfp_flags) struct omap_req *req; req = kzalloc(sizeof(*req), gfp_flags); - if (req) { - req->req.dma = DMA_ADDR_INVALID; - INIT_LIST_HEAD(&req->queue); - } + if (!req) + return NULL; + + req->req.dma = DMA_ADDR_INVALID; + INIT_LIST_HEAD(&req->queue); + return &req->req; }