From b40c98dd62b2fae5c4e7124977f2848f9460c257 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Wed, 22 Aug 2012 15:49:01 +0530 Subject: [PATCH] --- yaml --- r: 325889 b: refs/heads/master c: 1660c8944652aac142e622d276c3750f735a568f h: refs/heads/master i: 325887: dbd92ccf4301e46165bb08cf2a4b8d6831f02b4a v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c2410_udc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3903b54114d5..e1d0d0539524 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff24166c3996a343f3901a47bd5fef6181ac21f9 +refs/heads/master: 1660c8944652aac142e622d276c3750f735a568f diff --git a/trunk/drivers/usb/gadget/s3c2410_udc.c b/trunk/drivers/usb/gadget/s3c2410_udc.c index d9e3a21b3ddc..e895ea12b67e 100644 --- a/trunk/drivers/usb/gadget/s3c2410_udc.c +++ b/trunk/drivers/usb/gadget/s3c2410_udc.c @@ -1696,7 +1696,8 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver, udc->gadget.dev.driver = &driver->driver; /* Bind the driver */ - if ((retval = device_add(&udc->gadget.dev)) != 0) { + retval = device_add(&udc->gadget.dev); + if (retval) { dev_err(&udc->gadget.dev, "Error in device_add() : %d\n", retval); goto register_error; } @@ -1704,7 +1705,8 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver, dprintk(DEBUG_NORMAL, "binding gadget driver '%s'\n", driver->driver.name); - if ((retval = bind(&udc->gadget)) != 0) { + retval = bind(&udc->gadget); + if (retval) { device_del(&udc->gadget.dev); goto register_error; }