diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-28 14:43:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:58 -0400 |
commit | 4d42e1bb9e8ec7eb5e39d82aaf3ff2f3c994af84 (patch) | |
tree | 1316e32df6772e99221a9b88cbcc6f60abfc3f54 /drivers/usb/misc/cypress_cy7c63.c | |
parent | 1b21d5e166e104f8914441ef52e2cd50ce65b479 (diff) |
USB: fix __must_check warnings in drivers/usb/misc/
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/cypress_cy7c63.c')
-rw-r--r-- | drivers/usb/misc/cypress_cy7c63.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c index 9c46746d5d00..b63b5f34b2aa 100644 --- a/drivers/usb/misc/cypress_cy7c63.c +++ b/drivers/usb/misc/cypress_cy7c63.c | |||
@@ -209,7 +209,7 @@ static int cypress_probe(struct usb_interface *interface, | |||
209 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 209 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
210 | if (dev == NULL) { | 210 | if (dev == NULL) { |
211 | dev_err(&interface->dev, "Out of memory!\n"); | 211 | dev_err(&interface->dev, "Out of memory!\n"); |
212 | goto error; | 212 | goto error_mem; |
213 | } | 213 | } |
214 | 214 | ||
215 | dev->udev = usb_get_dev(interface_to_usbdev(interface)); | 215 | dev->udev = usb_get_dev(interface_to_usbdev(interface)); |
@@ -218,15 +218,26 @@ static int cypress_probe(struct usb_interface *interface, | |||
218 | usb_set_intfdata(interface, dev); | 218 | usb_set_intfdata(interface, dev); |
219 | 219 | ||
220 | /* create device attribute files */ | 220 | /* create device attribute files */ |
221 | device_create_file(&interface->dev, &dev_attr_port0); | 221 | retval = device_create_file(&interface->dev, &dev_attr_port0); |
222 | device_create_file(&interface->dev, &dev_attr_port1); | 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 | /* let the user know that the device is now attached */ | 228 | /* let the user know that the device is now attached */ |
225 | dev_info(&interface->dev, | 229 | dev_info(&interface->dev, |
226 | "Cypress CY7C63xxx device now attached\n"); | 230 | "Cypress CY7C63xxx device now attached\n"); |
231 | return 0; | ||
227 | 232 | ||
228 | retval = 0; | ||
229 | error: | 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 | return retval; | 241 | return retval; |
231 | } | 242 | } |
232 | 243 | ||