[PATCH 2/2] HID: i2c-hid: exit if the IRQ is not valid

From	Benjamin Tissoires <benjamin.tissoires@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] HID: i2c-hid: exit if the IRQ is not valid
Date	2016-10-13 11:40 +0200
Message-ID	<srKEx-1EP-7@gated-at.bofh.it> (permalink)
References	<srKEx-1EP-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: David Arcari <darcari@redhat.com>

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>
---
 drivers/hid/i2c-hid/i2c-hid.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 4cd606c..fe6b4e0 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -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;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/2] HID: i2c-hid: exit if the IRQ is not valid Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-10-13 11:40 +0200
  Re: [PATCH 2/2] HID: i2c-hid: exit if the IRQ is not valid Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-10-13 12:30 +0200

csiph-web