tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman 4d42e1bb 1b21d5e1

+57 -17
+15 -4
drivers/usb/misc/cypress_cy7c63.c
··· 209 209 dev = kzalloc(sizeof(*dev), GFP_KERNEL); 210 210 if (dev == NULL) { 211 211 dev_err(&interface->dev, "Out of memory!\n"); 212 - goto error; 212 + goto error_mem; 213 213 } 214 214 215 215 dev->udev = usb_get_dev(interface_to_usbdev(interface)); ··· 218 218 usb_set_intfdata(interface, dev); 219 219 220 220 /* create device attribute files */ 221 - device_create_file(&interface->dev, &dev_attr_port0); 222 - device_create_file(&interface->dev, &dev_attr_port1); 221 + retval = device_create_file(&interface->dev, &dev_attr_port0); 222 + if (retval) 223 + goto error; 224 + retval = device_create_file(&interface->dev, &dev_attr_port1); 225 + if (retval) 226 + goto error; 223 227 224 228 /* let the user know that the device is now attached */ 225 229 dev_info(&interface->dev, 226 230 "Cypress CY7C63xxx device now attached\n"); 231 + return 0; 227 232 228 - retval = 0; 229 233 error: 234 + device_remove_file(&interface->dev, &dev_attr_port0); 235 + device_remove_file(&interface->dev, &dev_attr_port1); 236 + usb_set_intfdata(interface, NULL); 237 + usb_put_dev(dev->udev); 238 + kfree(dev); 239 + 240 + error_mem: 230 241 return retval; 231 242 } 232 243
+26 -9
drivers/usb/misc/cytherm.c
··· 353 353 dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL); 354 354 if (dev == NULL) { 355 355 dev_err (&interface->dev, "Out of memory\n"); 356 - goto error; 356 + goto error_mem; 357 357 } 358 358 359 359 dev->udev = usb_get_dev(udev); ··· 362 362 363 363 dev->brightness = 0xFF; 364 364 365 - device_create_file(&interface->dev, &dev_attr_brightness); 366 - device_create_file(&interface->dev, &dev_attr_temp); 367 - device_create_file(&interface->dev, &dev_attr_button); 368 - device_create_file(&interface->dev, &dev_attr_port0); 369 - device_create_file(&interface->dev, &dev_attr_port1); 365 + retval = device_create_file(&interface->dev, &dev_attr_brightness); 366 + if (retval) 367 + goto error; 368 + retval = device_create_file(&interface->dev, &dev_attr_temp); 369 + if (retval) 370 + goto error; 371 + retval = device_create_file(&interface->dev, &dev_attr_button); 372 + if (retval) 373 + goto error; 374 + retval = device_create_file(&interface->dev, &dev_attr_port0); 375 + if (retval) 376 + goto error; 377 + retval = device_create_file(&interface->dev, &dev_attr_port1); 378 + if (retval) 379 + goto error; 370 380 371 - dev_info (&interface->dev, 381 + dev_info (&interface->dev, 372 382 "Cypress thermometer device now attached\n"); 373 383 return 0; 374 - 375 - error: 384 + error: 385 + device_remove_file(&interface->dev, &dev_attr_brightness); 386 + device_remove_file(&interface->dev, &dev_attr_temp); 387 + device_remove_file(&interface->dev, &dev_attr_button); 388 + device_remove_file(&interface->dev, &dev_attr_port0); 389 + device_remove_file(&interface->dev, &dev_attr_port1); 390 + usb_set_intfdata (interface, NULL); 391 + usb_put_dev(dev->udev); 376 392 kfree(dev); 393 + error_mem: 377 394 return retval; 378 395 } 379 396
+16 -4
drivers/usb/misc/usbled.c
··· 108 108 dev = kzalloc(sizeof(struct usb_led), GFP_KERNEL); 109 109 if (dev == NULL) { 110 110 dev_err(&interface->dev, "Out of memory\n"); 111 - goto error; 111 + goto error_mem; 112 112 } 113 113 114 114 dev->udev = usb_get_dev(udev); 115 115 116 116 usb_set_intfdata (interface, dev); 117 117 118 - device_create_file(&interface->dev, &dev_attr_blue); 119 - device_create_file(&interface->dev, &dev_attr_red); 120 - device_create_file(&interface->dev, &dev_attr_green); 118 + retval = device_create_file(&interface->dev, &dev_attr_blue); 119 + if (retval) 120 + goto error; 121 + retval = device_create_file(&interface->dev, &dev_attr_red); 122 + if (retval) 123 + goto error; 124 + retval = device_create_file(&interface->dev, &dev_attr_green); 125 + if (retval) 126 + goto error; 121 127 122 128 dev_info(&interface->dev, "USB LED device now attached\n"); 123 129 return 0; 124 130 125 131 error: 132 + device_remove_file(&interface->dev, &dev_attr_blue); 133 + device_remove_file(&interface->dev, &dev_attr_red); 134 + device_remove_file(&interface->dev, &dev_attr_green); 135 + usb_set_intfdata (interface, NULL); 136 + usb_put_dev(dev->udev); 126 137 kfree(dev); 138 + error_mem: 127 139 return retval; 128 140 } 129 141