* [patch 1/2] macintosh: wrong test in fan_{read,write}_reg()
@ 2011-01-18 21:09 akpm
2011-01-18 21:22 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2011-01-18 21:09 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev, akpm, roel.kluin
From: roel kluin <roel.kluin@gmail.com>
Fix error test in fan_{read,write}_reg()
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/macintosh/therm_pm72.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/macintosh/therm_pm72.c~macintosh-wrong-test-in-fan_readwrite_reg drivers/macintosh/therm_pm72.c
--- a/drivers/macintosh/therm_pm72.c~macintosh-wrong-test-in-fan_readwrite_reg
+++ a/drivers/macintosh/therm_pm72.c
@@ -443,7 +443,7 @@ static int fan_read_reg(int reg, unsigne
tries = 0;
for (;;) {
nr = i2c_master_recv(fcu, buf, nb);
- if (nr > 0 || (nr < 0 && nr != ENODEV) || tries >= 100)
+ if (nr > 0 || (nr < 0 && nr != -ENODEV) || tries >= 100)
break;
msleep(10);
++tries;
@@ -464,7 +464,7 @@ static int fan_write_reg(int reg, const
tries = 0;
for (;;) {
nw = i2c_master_send(fcu, buf, nb);
- if (nw > 0 || (nw < 0 && nw != EIO) || tries >= 100)
+ if (nw > 0 || (nw < 0 && nw != -EIO) || tries >= 100)
break;
msleep(10);
++tries;
_
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch 1/2] macintosh: wrong test in fan_{read,write}_reg()
2011-01-18 21:09 [patch 1/2] macintosh: wrong test in fan_{read,write}_reg() akpm
@ 2011-01-18 21:22 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2011-01-18 21:22 UTC (permalink / raw)
To: akpm; +Cc: linuxppc-dev, roel.kluin
On Tue, 2011-01-18 at 13:09 -0800, akpm@linux-foundation.org wrote:
> From: roel kluin <roel.kluin@gmail.com>
>
> Fix error test in fan_{read,write}_reg()
Thanks, I'll pick that up.
Cheers,
Ben.
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> drivers/macintosh/therm_pm72.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff -puN drivers/macintosh/therm_pm72.c~macintosh-wrong-test-in-fan_readwrite_reg drivers/macintosh/therm_pm72.c
> --- a/drivers/macintosh/therm_pm72.c~macintosh-wrong-test-in-fan_readwrite_reg
> +++ a/drivers/macintosh/therm_pm72.c
> @@ -443,7 +443,7 @@ static int fan_read_reg(int reg, unsigne
> tries = 0;
> for (;;) {
> nr = i2c_master_recv(fcu, buf, nb);
> - if (nr > 0 || (nr < 0 && nr != ENODEV) || tries >= 100)
> + if (nr > 0 || (nr < 0 && nr != -ENODEV) || tries >= 100)
> break;
> msleep(10);
> ++tries;
> @@ -464,7 +464,7 @@ static int fan_write_reg(int reg, const
> tries = 0;
> for (;;) {
> nw = i2c_master_send(fcu, buf, nb);
> - if (nw > 0 || (nw < 0 && nw != EIO) || tries >= 100)
> + if (nw > 0 || (nw < 0 && nw != -EIO) || tries >= 100)
> break;
> msleep(10);
> ++tries;
> _
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-18 21:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-18 21:09 [patch 1/2] macintosh: wrong test in fan_{read,write}_reg() akpm
2011-01-18 21:22 ` Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).