diff options
author | Parag Warudkar <parag.warudkar@gmail.com> | 2008-08-12 18:08:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 19:07:28 -0400 |
commit | ff1a4a7b14ae146142b1c93a001304caf662ae13 (patch) | |
tree | b9fb32e4d408f22305ed840373288a60220fb1ea /drivers/usb/misc | |
parent | 66198f36aac21533245a77aac4a8f7c8c509d8bd (diff) |
isight_firmware: fix a leak and double kfree()
Signed-off-by: Parag Warudkar <parag.warudkar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/isight_firmware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index d94aa7387608..b897f6554ecd 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c | |||
@@ -48,7 +48,8 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
48 | 48 | ||
49 | if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { | 49 | if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { |
50 | printk(KERN_ERR "Unable to load isight firmware\n"); | 50 | printk(KERN_ERR "Unable to load isight firmware\n"); |
51 | return -ENODEV; | 51 | ret = -ENODEV; |
52 | goto out; | ||
52 | } | 53 | } |
53 | 54 | ||
54 | ptr = firmware->data; | 55 | ptr = firmware->data; |
@@ -91,7 +92,6 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
91 | buf, llen, 300) != llen) { | 92 | buf, llen, 300) != llen) { |
92 | printk(KERN_ERR | 93 | printk(KERN_ERR |
93 | "Failed to load isight firmware\n"); | 94 | "Failed to load isight firmware\n"); |
94 | kfree(buf); | ||
95 | ret = -ENODEV; | 95 | ret = -ENODEV; |
96 | goto out; | 96 | goto out; |
97 | } | 97 | } |