summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-05-08 11:56:37 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 17:51:46 -0700
commit37014f5bd069d4ea1a509ae1a978a74b1aa920b2 (patch)
tree750e5d6e2048959616ba172b5d3aeb36f95a4f82 /drivers
parentb29f680c4fe305902d02c1d5aa4968fe13a45fe6 (diff)
downloadlinux-stable-37014f5bd069d4ea1a509ae1a978a74b1aa920b2.tar.gz
linux-stable-37014f5bd069d4ea1a509ae1a978a74b1aa920b2.tar.bz2
linux-stable-37014f5bd069d4ea1a509ae1a978a74b1aa920b2.zip
w1: mxc_w1: Fix incorrect "presence" status
W1 reset_bus() should return zero if slave device is present. This patch fix this issue. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/w1/masters/mxc_w1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 67b067a3e2ab..a5df5e89d456 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -66,7 +66,7 @@ static u8 mxc_w1_ds2_reset_bus(void *data)
udelay(100);
}
- return !!(reg_val & MXC_W1_CONTROL_PST);
+ return !(reg_val & MXC_W1_CONTROL_PST);
}
/*