From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Dan Murphy <dmurphy@ti.com>,
linux-iio@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch v2] iio: tsl4531: fix error handling in tsl4531_check_id()
Date: Mon, 17 Aug 2015 14:38:33 +0000 [thread overview]
Message-ID: <20150817143832.GC23820@mwanda> (raw)
In-Reply-To: <55CF4E38.70506@kernel.org>
tsl4531_check_id() returns 1 on "found", 0 on "not found" and negative
if there is an error. The bug here is that the error handling, treats
errors as "found".
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: slightly different fix
diff --git a/drivers/iio/light/tsl4531.c b/drivers/iio/light/tsl4531.c
index 2697918..fca0cb0 100644
--- a/drivers/iio/light/tsl4531.c
+++ b/drivers/iio/light/tsl4531.c
@@ -180,7 +180,10 @@ static int tsl4531_probe(struct i2c_client *client,
data->client = client;
mutex_init(&data->lock);
- if (!tsl4531_check_id(client)) {
+ ret = tsl4531_check_id(client);
+ if (ret < 0)
+ return ret;
+ if (ret = 0) {
dev_err(&client->dev, "no TSL4531 sensor\n");
return -ENODEV;
}
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Dan Murphy <dmurphy@ti.com>,
linux-iio@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch v2] iio: tsl4531: fix error handling in tsl4531_check_id()
Date: Mon, 17 Aug 2015 17:38:33 +0300 [thread overview]
Message-ID: <20150817143832.GC23820@mwanda> (raw)
In-Reply-To: <55CF4E38.70506@kernel.org>
tsl4531_check_id() returns 1 on "found", 0 on "not found" and negative
if there is an error. The bug here is that the error handling, treats
errors as "found".
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: slightly different fix
diff --git a/drivers/iio/light/tsl4531.c b/drivers/iio/light/tsl4531.c
index 2697918..fca0cb0 100644
--- a/drivers/iio/light/tsl4531.c
+++ b/drivers/iio/light/tsl4531.c
@@ -180,7 +180,10 @@ static int tsl4531_probe(struct i2c_client *client,
data->client = client;
mutex_init(&data->lock);
- if (!tsl4531_check_id(client)) {
+ ret = tsl4531_check_id(client);
+ if (ret < 0)
+ return ret;
+ if (ret == 0) {
dev_err(&client->dev, "no TSL4531 sensor\n");
return -ENODEV;
}
next prev parent reply other threads:[~2015-08-17 14:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-13 20:21 [patch] iio: tsl4531: fix error handling in tsl4531_check_id() Dan Carpenter
2015-08-13 20:21 ` Dan Carpenter
2015-08-13 21:03 ` Dan Murphy
2015-08-13 21:03 ` Dan Murphy
2015-08-15 14:36 ` Jonathan Cameron
2015-08-15 14:36 ` Jonathan Cameron
2015-08-15 14:35 ` Jonathan Cameron
2015-08-15 14:35 ` Jonathan Cameron
2015-08-17 14:38 ` Dan Carpenter [this message]
2015-08-17 14:38 ` [patch v2] " Dan Carpenter
2015-08-17 14:51 ` Peter Meerwald
2015-08-17 14:51 ` Peter Meerwald
2015-08-17 15:05 ` Dan Murphy
2015-08-17 15:05 ` Dan Murphy
2015-08-18 9:16 ` [patch v3] " Dan Carpenter
2015-08-18 9:16 ` Dan Carpenter
2015-08-31 15:30 ` Jonathan Cameron
2015-08-31 15:30 ` Jonathan Cameron
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=20150817143832.GC23820@mwanda \
--to=dan.carpenter@oracle.com \
--cc=dmurphy@ti.com \
--cc=jic23@kernel.org \
--cc=k.kozlowski@samsung.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.