mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
USB: fix __must_check warnings in drivers/usb/misc/
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
1b21d5e166
commit
4d42e1bb9e
3 changed files with 57 additions and 17 deletions
|
@ -209,7 +209,7 @@ static int cypress_probe(struct usb_interface *interface,
|
|||
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
||||
if (dev == NULL) {
|
||||
dev_err(&interface->dev, "Out of memory!\n");
|
||||
goto error;
|
||||
goto error_mem;
|
||||
}
|
||||
|
||||
dev->udev = usb_get_dev(interface_to_usbdev(interface));
|
||||
|
@ -218,15 +218,26 @@ static int cypress_probe(struct usb_interface *interface,
|
|||
usb_set_intfdata(interface, dev);
|
||||
|
||||
/* create device attribute files */
|
||||
device_create_file(&interface->dev, &dev_attr_port0);
|
||||
device_create_file(&interface->dev, &dev_attr_port1);
|
||||
retval = device_create_file(&interface->dev, &dev_attr_port0);
|
||||
if (retval)
|
||||
goto error;
|
||||
retval = device_create_file(&interface->dev, &dev_attr_port1);
|
||||
if (retval)
|
||||
goto error;
|
||||
|
||||
/* let the user know that the device is now attached */
|
||||
dev_info(&interface->dev,
|
||||
"Cypress CY7C63xxx device now attached\n");
|
||||
return 0;
|
||||
|
||||
retval = 0;
|
||||
error:
|
||||
device_remove_file(&interface->dev, &dev_attr_port0);
|
||||
device_remove_file(&interface->dev, &dev_attr_port1);
|
||||
usb_set_intfdata(interface, NULL);
|
||||
usb_put_dev(dev->udev);
|
||||
kfree(dev);
|
||||
|
||||
error_mem:
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
|
@ -353,7 +353,7 @@ static int cytherm_probe(struct usb_interface *interface,
|
|||
dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL);
|
||||
if (dev == NULL) {
|
||||
dev_err (&interface->dev, "Out of memory\n");
|
||||
goto error;
|
||||
goto error_mem;
|
||||
}
|
||||
|
||||
dev->udev = usb_get_dev(udev);
|
||||
|
@ -362,18 +362,35 @@ static int cytherm_probe(struct usb_interface *interface,
|
|||
|
||||
dev->brightness = 0xFF;
|
||||
|
||||
device_create_file(&interface->dev, &dev_attr_brightness);
|
||||
device_create_file(&interface->dev, &dev_attr_temp);
|
||||
device_create_file(&interface->dev, &dev_attr_button);
|
||||
device_create_file(&interface->dev, &dev_attr_port0);
|
||||
device_create_file(&interface->dev, &dev_attr_port1);
|
||||
retval = device_create_file(&interface->dev, &dev_attr_brightness);
|
||||
if (retval)
|
||||
goto error;
|
||||
retval = device_create_file(&interface->dev, &dev_attr_temp);
|
||||
if (retval)
|
||||
goto error;
|
||||
retval = device_create_file(&interface->dev, &dev_attr_button);
|
||||
if (retval)
|
||||
goto error;
|
||||
retval = device_create_file(&interface->dev, &dev_attr_port0);
|
||||
if (retval)
|
||||
goto error;
|
||||
retval = device_create_file(&interface->dev, &dev_attr_port1);
|
||||
if (retval)
|
||||
goto error;
|
||||
|
||||
dev_info (&interface->dev,
|
||||
dev_info (&interface->dev,
|
||||
"Cypress thermometer device now attached\n");
|
||||
return 0;
|
||||
|
||||
error:
|
||||
error:
|
||||
device_remove_file(&interface->dev, &dev_attr_brightness);
|
||||
device_remove_file(&interface->dev, &dev_attr_temp);
|
||||
device_remove_file(&interface->dev, &dev_attr_button);
|
||||
device_remove_file(&interface->dev, &dev_attr_port0);
|
||||
device_remove_file(&interface->dev, &dev_attr_port1);
|
||||
usb_set_intfdata (interface, NULL);
|
||||
usb_put_dev(dev->udev);
|
||||
kfree(dev);
|
||||
error_mem:
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
|
@ -108,22 +108,34 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id
|
|||
dev = kzalloc(sizeof(struct usb_led), GFP_KERNEL);
|
||||
if (dev == NULL) {
|
||||
dev_err(&interface->dev, "Out of memory\n");
|
||||
goto error;
|
||||
goto error_mem;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue