diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-09-17 12:55:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 00:10:57 +0200 |
| commit | ac08de32d2e2b2b56bfe85720ec9e0b06e75350a (patch) | |
| tree | 0d2dfb416b6a5ec02758f037f1e6cbc0d8177ab5 | |
| parent | Merge 3.6-rc6 into usb-next (diff) | |
| download | linux-ac08de32d2e2b2b56bfe85720ec9e0b06e75350a.tar.xz linux-ac08de32d2e2b2b56bfe85720ec9e0b06e75350a.zip | |
usb: remove junk from store_remove_id
retval is 0, and carefully assigned - and tested as non zero.
This is not useful. While we are at it remove some other bogus initialisation
in the function
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/driver.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 445455a4429b..ddd820d25288 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -125,10 +125,9 @@ store_remove_id(struct device_driver *driver, const char *buf, size_t count) { struct usb_dynid *dynid, *n; struct usb_driver *usb_driver = to_usb_driver(driver); - u32 idVendor = 0; - u32 idProduct = 0; - int fields = 0; - int retval = 0; + u32 idVendor; + u32 idProduct; + int fields; fields = sscanf(buf, "%x %x", &idVendor, &idProduct); if (fields < 2) @@ -141,14 +140,10 @@ store_remove_id(struct device_driver *driver, const char *buf, size_t count) (id->idProduct == idProduct)) { list_del(&dynid->node); kfree(dynid); - retval = 0; break; } } spin_unlock(&usb_driver->dynids.lock); - - if (retval) - return retval; return count; } static DRIVER_ATTR(remove_id, S_IRUGO | S_IWUSR, show_dynids, store_remove_id); |