diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2014-02-22 11:29:49 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-28 15:27:09 -0800 |
| commit | aea476b50503ece7c95a15484427aedfff87af04 (patch) | |
| tree | a197fc41d011411d2eb739e560283df75bedb671 /drivers/w1 | |
| parent | adffe4ab961113c5db8fee802f8e39b82a15d8e1 (diff) | |
| download | op-kernel-dev-aea476b50503ece7c95a15484427aedfff87af04.zip op-kernel-dev-aea476b50503ece7c95a15484427aedfff87af04.tar.gz | |
w1: mxc_w1: Fix mxc_w1_ds2_reset_bus() return value
This patch fix mxc_w1_ds2_reset_bus() return value.
According to i.MX reference manual, "presence status" reflected
in the bit 6 of control register.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 1e5d94c..6525b2c 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -74,7 +74,7 @@ static u8 mxc_w1_ds2_reset_bus(void *data) udelay(100); } - return (reg_val >> 7) & 0x1; + return (reg_val >> 6) & 0x1; } /* |
