fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / usb / misc / usbled.c

diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index 877b081..49c5c5c 100644 (file)
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -106,26 +105,37 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id
        struct usb_led *dev = NULL;
        int retval = -ENOMEM;
 
-       dev = kmalloc(sizeof(struct usb_led), GFP_KERNEL);
+       dev = kzalloc(sizeof(struct usb_led), GFP_KERNEL);
        if (dev == NULL) {
                dev_err(&interface->dev, "Out of memory\n");
-               goto error;
+               goto error_mem;
        }
-       memset (dev, 0x00, sizeof (*dev));
 
        dev->udev = usb_get_dev(udev);
 
        usb_set_intfdata (interface, dev);
 
-       device_create_file(&interface->dev, &dev_attr_blue);
-       device_create_file(&interface->dev, &dev_attr_red);
-       device_create_file(&interface->dev, &dev_attr_green);
+       retval = device_create_file(&interface->dev, &dev_attr_blue);
+       if (retval)
+               goto error;
+       retval = device_create_file(&interface->dev, &dev_attr_red);
+       if (retval)
+               goto error;
+       retval = device_create_file(&interface->dev, &dev_attr_green);
+       if (retval)
+               goto error;
 
        dev_info(&interface->dev, "USB LED device now attached\n");
        return 0;
 
 error:
+       device_remove_file(&interface->dev, &dev_attr_blue);
+       device_remove_file(&interface->dev, &dev_attr_red);
+       device_remove_file(&interface->dev, &dev_attr_green);
+       usb_set_intfdata (interface, NULL);
+       usb_put_dev(dev->udev);
        kfree(dev);
+error_mem:
        return retval;
 }