lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: dummy-hcd: fix "warn-unused-result" messages

Browse Source 
This patch (as758) fixes the "warn-unused-result" messages in dummy-hcd.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2006-09-25 11:55:56 -04:00 committed by Greg Kroah-Hartman
parent bd859281c0
commit efd54a3641
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/usb/gadget/dummy_hcd.c
View File

@ -816,15 +816,14 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
dum->gadget.dev.driver = &driver->driver; dum->gadget.dev.driver = &driver->driver;
dev_dbg (udc_dev(dum), "binding gadget driver '%s'\n", dev_dbg (udc_dev(dum), "binding gadget driver '%s'\n",
driver->driver.name); driver->driver.name);
if ((retval = driver->bind (&dum->gadget)) != 0) { if ((retval = driver->bind (&dum->gadget)) != 0)
dum->driver = NULL; goto err_bind_gadget;
dum->gadget.dev.driver = NULL;
return retval;
}
driver->driver.bus = dum->gadget.dev.parent->bus; driver->driver.bus = dum->gadget.dev.parent->bus;
driver_register (&driver->driver); if ((retval = driver_register (&driver->driver)) != 0)
device_bind_driver (&dum->gadget.dev); goto err_register;
if ((retval = device_bind_driver (&dum->gadget.dev)) != 0)
goto err_bind_driver;
/* khubd will enumerate this in a while */ /* khubd will enumerate this in a while */
spin_lock_irq (&dum->lock); spin_lock_irq (&dum->lock);
@ -834,6 +833,19 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
usb_hcd_poll_rh_status (dummy_to_hcd (dum)); usb_hcd_poll_rh_status (dummy_to_hcd (dum));
return 0; return 0;
err_bind_driver:
driver_unregister (&driver->driver);
err_register:
driver->unbind (&dum->gadget);
spin_lock_irq (&dum->lock);
dum->pullup = 0;
set_link_state (dum);
spin_unlock_irq (&dum->lock);
err_bind_gadget:
dum->driver = NULL;
dum->gadget.dev.driver = NULL;
return retval;
} }
EXPORT_SYMBOL (usb_gadget_register_driver); EXPORT_SYMBOL (usb_gadget_register_driver);
@ -916,7 +928,9 @@ static int dummy_udc_probe (struct platform_device *pdev)
usb_get_hcd (dummy_to_hcd (dum)); usb_get_hcd (dummy_to_hcd (dum));
platform_set_drvdata (pdev, dum); platform_set_drvdata (pdev, dum);
device_create_file (&dum->gadget.dev, &dev_attr_function); rc = device_create_file (&dum->gadget.dev, &dev_attr_function);
if (rc < 0)
device_unregister (&dum->gadget.dev);
return rc; return rc;
} }
@ -1864,8 +1878,7 @@ static int dummy_start (struct usb_hcd *hcd)
#endif #endif
/* FIXME 'urbs' should be a per-device thing, maybe in usbcore */ /* FIXME 'urbs' should be a per-device thing, maybe in usbcore */
device_create_file (dummy_dev(dum), &dev_attr_urbs); return device_create_file (dummy_dev(dum), &dev_attr_urbs);
return 0;
} }
static void dummy_stop (struct usb_hcd *hcd) static void dummy_stop (struct usb_hcd *hcd)