Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325889
b: refs/heads/master
c: 1660c89
h: refs/heads/master
i:
  325887: dbd92cc
v: v3
  • Loading branch information
Sachin Kamat authored and Felipe Balbi committed Aug 31, 2012
1 parent 761df0e commit b40c98d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ff24166c3996a343f3901a47bd5fef6181ac21f9
refs/heads/master: 1660c8944652aac142e622d276c3750f735a568f
6 changes: 4 additions & 2 deletions trunk/drivers/usb/gadget/s3c2410_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1696,15 +1696,17 @@ 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;
}

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;
}
Expand Down

0 comments on commit b40c98d

Please sign in to comment.