diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-12-29 17:47:27 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-01-02 07:50:36 -0500 |
commit | 8cd5fcda24b48b162699730da7ead7329b27159e (patch) | |
tree | f9b8a319d4c0a202abb5e13fcbdffd499ee406d5 /drivers/hid | |
parent | 0a286ef278529f2bc4f4bb27c4cf99c05999c818 (diff) |
HID: sony: fix error return code
Currently the return variable ret is always 0. Set it to other values in
error cases, as used in the direct return.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-sony.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index b60bc38903db..f57ab5e2832f 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
@@ -585,6 +585,7 @@ static int sony_leds_init(struct hid_device *hdev) | |||
585 | led = kzalloc(sizeof(struct led_classdev) + name_sz, GFP_KERNEL); | 585 | led = kzalloc(sizeof(struct led_classdev) + name_sz, GFP_KERNEL); |
586 | if (!led) { | 586 | if (!led) { |
587 | hid_err(hdev, "Couldn't allocate memory for LED %d\n", n); | 587 | hid_err(hdev, "Couldn't allocate memory for LED %d\n", n); |
588 | ret = -ENOMEM; | ||
588 | goto error_leds; | 589 | goto error_leds; |
589 | } | 590 | } |
590 | 591 | ||
@@ -596,7 +597,8 @@ static int sony_leds_init(struct hid_device *hdev) | |||
596 | led->brightness_get = sony_led_get_brightness; | 597 | led->brightness_get = sony_led_get_brightness; |
597 | led->brightness_set = sony_led_set_brightness; | 598 | led->brightness_set = sony_led_set_brightness; |
598 | 599 | ||
599 | if (led_classdev_register(&hdev->dev, led)) { | 600 | ret = led_classdev_register(&hdev->dev, led); |
601 | if (ret) { | ||
600 | hid_err(hdev, "Failed to register LED %d\n", n); | 602 | hid_err(hdev, "Failed to register LED %d\n", n); |
601 | kfree(led); | 603 | kfree(led); |
602 | goto error_leds; | 604 | goto error_leds; |