]> git.karo-electronics.de Git - linux-beck.git/commitdiff
HID: i2c-hid: exit if the IRQ is not valid
authorDavid Arcari <darcari@redhat.com>
Thu, 13 Oct 2016 09:30:45 +0000 (11:30 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 14 Oct 2016 14:02:05 +0000 (16:02 +0200)
When i2c-core doesn't find the IRQ associated to the GPIO because
the gpiochip is not available, it assigns -EPROBE_DEFER to the irq.
We need to bail out there and on any other error in an IRQ.

Signed-off-by: David Arcari <darcari@redhat.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/i2c-hid/i2c-hid.c

index 4cd606c0d89c1f3a349532b1778af18f0d93010a..fe6b4e0eab4a64f52f6d2568fe8fac4ab14af5c9 100644 (file)
@@ -956,6 +956,13 @@ static int i2c_hid_probe(struct i2c_client *client,
                return -EINVAL;
        }
 
+       if (client->irq < 0) {
+               if (client->irq != -EPROBE_DEFER)
+                       dev_err(&client->dev,
+                               "HID over i2c doesn't have a valid IRQ\n");
+               return client->irq;
+       }
+
        ihid = kzalloc(sizeof(struct i2c_hid), GFP_KERNEL);
        if (!ihid)
                return -ENOMEM;