USB: fix __must_check warnings in drivers/usb/core/

[pandora-kernel.git] / drivers / usb / core / sysfs.c

diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 3f49bf5..55d8f57 100644 (file)
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -10,7 +10,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/usb.h>
 #include "usb.h"
@@ -61,7 +60,7 @@ static ssize_t
 set_bConfigurationValue (struct device *dev, struct device_attribute *attr,
                const char *buf, size_t count)
 {
-       struct usb_device       *udev = udev = to_usb_device (dev);
+       struct usb_device       *udev = to_usb_device (dev);
        int                     config, value;
 
        if (sscanf (buf, "%u", &config) != 1 || config > 255)
@@ -187,6 +186,7 @@ usb_descriptor_attr (bMaxPacketSize0, "%d\n")
 
 static struct attribute *dev_attrs[] = {
        /* current configuration's attributes */
+       &dev_attr_configuration.attr,
        &dev_attr_bNumInterfaces.attr,
        &dev_attr_bConfigurationValue.attr,
        &dev_attr_bmAttributes.attr,
@@ -210,20 +210,40 @@ static struct attribute_group dev_attr_grp = {
        .attrs = dev_attrs,
 };
 
-void usb_create_sysfs_dev_files (struct usb_device *udev)
+int usb_create_sysfs_dev_files(struct usb_device *udev)
 {
        struct device *dev = &udev->dev;
+       int retval;
 
-       sysfs_create_group(&dev->kobj, &dev_attr_grp);
+       retval = sysfs_create_group(&dev->kobj, &dev_attr_grp);
+       if (retval)
+               return retval;
 
-       if (udev->manufacturer)
-               device_create_file (dev, &dev_attr_manufacturer);
-       if (udev->product)
-               device_create_file (dev, &dev_attr_product);
-       if (udev->serial)
-               device_create_file (dev, &dev_attr_serial);
-       device_create_file (dev, &dev_attr_configuration);
-       usb_create_ep_files(dev, &udev->ep0, udev);
+       if (udev->manufacturer) {
+               retval = device_create_file (dev, &dev_attr_manufacturer);
+               if (retval)
+                       goto error;
+       }
+       if (udev->product) {
+               retval = device_create_file (dev, &dev_attr_product);
+               if (retval)
+                       goto error;
+       }
+       if (udev->serial) {
+               retval = device_create_file (dev, &dev_attr_serial);
+               if (retval)
+                       goto error;
+       }
+       retval = usb_create_ep_files(dev, &udev->ep0, udev);
+       if (retval)
+               goto error;
+       return 0;
+error:
+       usb_remove_ep_files(&udev->ep0);
+       device_remove_file(dev, &dev_attr_manufacturer);
+       device_remove_file(dev, &dev_attr_product);
+       device_remove_file(dev, &dev_attr_serial);
+       return retval;
 }
 
 void usb_remove_sysfs_dev_files (struct usb_device *udev)
@@ -239,7 +259,6 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev)
                device_remove_file(dev, &dev_attr_product);
        if (udev->serial)
                device_remove_file(dev, &dev_attr_serial);
-       device_remove_file (dev, &dev_attr_configuration);
 }
 
 /* Interface fields */
@@ -341,18 +360,28 @@ static inline void usb_remove_intf_ep_files(struct usb_interface *intf)
                usb_remove_ep_files(&iface_desc->endpoint[i]);
 }
 
-void usb_create_sysfs_intf_files (struct usb_interface *intf)
+int usb_create_sysfs_intf_files(struct usb_interface *intf)
 {
        struct usb_device *udev = interface_to_usbdev(intf);
        struct usb_host_interface *alt = intf->cur_altsetting;
+       int retval;
 
-       sysfs_create_group(&intf->dev.kobj, &intf_attr_grp);
+       retval = sysfs_create_group(&intf->dev.kobj, &intf_attr_grp);
+       if (retval)
+               goto error;
 
        if (alt->string == NULL)
                alt->string = usb_cache_string(udev, alt->desc.iInterface);
        if (alt->string)
-               device_create_file(&intf->dev, &dev_attr_interface);
+               retval = device_create_file(&intf->dev, &dev_attr_interface);
        usb_create_intf_ep_files(intf, udev);
+       return 0;
+error:
+       if (alt->string)
+               device_remove_file(&intf->dev, &dev_attr_interface);
+       sysfs_remove_group(&intf->dev.kobj, &intf_attr_grp);
+       usb_remove_intf_ep_files(intf);
+       return retval;
 }
 
 void usb_remove_sysfs_intf_files (struct usb_interface *intf)