From: Alexander Shiyan <shc_work@mail.ru>
Date: Sat, 22 Feb 2014 07:29:49 +0000 (+0400)
Subject: w1: mxc_w1: Fix mxc_w1_ds2_reset_bus() return value
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aea476b50503ece7c95a15484427aedfff87af04;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 1e5d94c5afc9..6525b2c67da9 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;
 }
 
 /*