From garzik@havoc.gtf.org Wed Oct 11 18:50:26 2006 Date: Wed, 11 Oct 2006 21:50:24 -0400 From: Jeff Garzik To: Greg KH , Andrew Morton Subject: USB/gadget/net2280: handle sysfs errors Message-ID: <20061012015024.GA13093@havoc.gtf.org> Content-Disposition: inline Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/net2280.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) --- gregkh-2.6.orig/drivers/usb/gadget/net2280.c +++ gregkh-2.6/drivers/usb/gadget/net2280.c @@ -2044,8 +2044,10 @@ int usb_gadget_register_driver (struct u return retval; } - device_create_file (&dev->pdev->dev, &dev_attr_function); - device_create_file (&dev->pdev->dev, &dev_attr_queues); + retval = device_create_file (&dev->pdev->dev, &dev_attr_function); + 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 * for set_configuration as well as eventual disconnect. @@ -2060,6 +2062,14 @@ int usb_gadget_register_driver (struct u /* pci writes may still be posted */ 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); @@ -2974,8 +2984,10 @@ static int net2280_probe (struct pci_dev : "disabled"); the_controller = dev; - device_register (&dev->gadget.dev); - device_create_file (&pdev->dev, &dev_attr_registers); + retval = device_register (&dev->gadget.dev); + if (retval) goto done; + retval = device_create_file (&pdev->dev, &dev_attr_registers); + if (retval) goto done; return 0;