mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bastien Nocera <hadess@hadess.net>,
	Alexandre Courbot <acourbot@nvidia.com>,
	Lejun Zhu <lejun.zhu@linux.intel.com>
Subject: [PATCH 2/3] Input - soc_button_array: bail out earlier if gpiod_count is null
Date: Tue, 10 May 2016 17:37:52 +0200	[thread overview]
Message-ID: <1462894673-26560-3-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1462894673-26560-1-git-send-email-benjamin.tissoires@redhat.com>

The PNP0C40 device of the Surface 3 doesn't have any GPIO attached to it.
Instead of trying to access the GPIO, request the count beforehand and
bail out if it is null or if an error is returned.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
 drivers/input/misc/soc_button_array.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 9cbe874..70002a3 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -165,6 +165,11 @@ static int soc_button_probe(struct platform_device *pdev)
 	if (!id)
 		return -ENODEV;
 
+	if (gpiod_count(&pdev->dev, KBUILD_MODNAME) <= 0) {
+		dev_info(&pdev->dev, "no GPIO attached, ignoring...\n");
+		return -ENODEV;
+	}
+
 	button_info = (struct soc_button_info *)id->driver_data;
 
 	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-- 
2.5.0

  parent reply	other threads:[~2016-05-10 15:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-10 15:37 [PATCH 0/3] Input: soc_button_array fixes and question Benjamin Tissoires
2016-05-10 15:37 ` [PATCH 1/3] Input - soc_button_array: use gpio_is_valid() Benjamin Tissoires
2016-05-10 15:56   ` Fabio Estevam
2016-05-10 16:33     ` Benjamin Tissoires
2016-05-10 15:37 ` Benjamin Tissoires [this message]
2016-05-10 15:37 ` [PATCH 3/3] Input - soc_button_array: make sure one GPIO is not assigned twice Benjamin Tissoires
2016-05-13 15:57 ` [PATCH 0/3] Input: soc_button_array fixes and question Benjamin Tissoires

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462894673-26560-3-git-send-email-benjamin.tissoires@redhat.com \
    --to=benjamin.tissoires@redhat.com \
    --cc=acourbot@nvidia.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=hadess@hadess.net \
    --cc=lejun.zhu@linux.intel.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yongjun_wei@trendmicro.com.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®