projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adffe4a
)
w1: mxc_w1: Fix mxc_w1_ds2_reset_bus() return value
author
Alexander Shiyan
<shc_work@mail.ru>
Sat, 22 Feb 2014 07:29:49 +0000
(11:29 +0400)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 28 Feb 2014 23:27:09 +0000
(15:27 -0800)
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>
drivers/w1/masters/mxc_w1.c
patch
|
blob
|
history
diff --git
a/drivers/w1/masters/mxc_w1.c
b/drivers/w1/masters/mxc_w1.c
index
1e5d94c
..
6525b2c
100644
(file)
--- 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;
}
/*