]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
HID: logitech-hidpp: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sun, 5 Apr 2015 12:06:29 +0000 (14:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sun, 5 Apr 2015 20:56:30 +0000 (22:56 +0200)
Return a negative error code on failure.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-logitech-hidpp.c

index 8e9cb25f45cb8596a5ae3172378e2b63b1c9ad4b..b3cf6fd4be96473ba62ebbbf92d1522c024a509e 100644 (file)
@@ -1220,6 +1220,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
        connected = hidpp_is_connected(hidpp);
        if (id->group != HID_GROUP_LOGITECH_DJ_DEVICE) {
                if (!connected) {
+                       ret = -ENODEV;
                        hid_err(hdev, "Device not connected");
                        hid_device_io_stop(hdev);
                        goto hid_parse_fail;