system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-24 21:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB/gadget/net2280: handle sysfs errors

Browse source 
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jeff Garzik 2006-10-11 21:50:24 -04:00 committed by Greg Kroah-Hartman
parent 5dfb5f1d06
commit b3899dacaf
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/usb/gadget/net2280.c
View file

@ -2044,8 +2044,10 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
return retval; return retval;
} }
device_create_file (&dev->pdev->dev, &dev_attr_function); retval = device_create_file (&dev->pdev->dev, &dev_attr_function);
device_create_file (&dev->pdev->dev, &dev_attr_queues); if (retval) goto err_unbind;
retval = device_create_file (&dev->pdev->dev, &dev_attr_queues);
if (retval) goto err_func;
/* ... then enable host detection and ep0; and we're ready /* ... then enable host detection and ep0; and we're ready
* for set_configuration as well as eventual disconnect. * for set_configuration as well as eventual disconnect.
@ -2060,6 +2062,14 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
/* pci writes may still be posted */ /* pci writes may still be posted */
return 0; return 0;
err_func:
device_remove_file (&dev->pdev->dev, &dev_attr_function);
err_unbind:
driver->unbind (&dev->gadget);
dev->gadget.dev.driver = NULL;
dev->driver = NULL;
return retval;
} }
EXPORT_SYMBOL (usb_gadget_register_driver); EXPORT_SYMBOL (usb_gadget_register_driver);
@ -2974,8 +2984,10 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
: "disabled"); : "disabled");
the_controller = dev; the_controller = dev;
device_register (&dev->gadget.dev); retval = device_register (&dev->gadget.dev);
device_create_file (&pdev->dev, &dev_attr_registers); if (retval) goto done;
retval = device_create_file (&pdev->dev, &dev_attr_registers);
if (retval) goto done;
return 0; return 0;