From 1f5ef74e2041d98a67da24158fe8637fd5bced6a Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Sun, 19 Feb 2012 13:10:00 +1100
Subject: [PATCH] --- yaml --- r: 288883 b: refs/heads/master c:
 b6c40b8581d5f2c88d18d7905b9ff6ba9956f506 h: refs/heads/master i:   288881:
 f2d016dcd76c7ccc242cd6b879eca4462ecbb8d3   288879:
 d6a887ab31643a619cf8861c4959d7c9f3a50197 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/w1/slaves/w1_bq27000.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4d824ca27edb..f96b0ac37a57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93518dd2ebafcc761a8637b2877008cfd748c202
+refs/heads/master: b6c40b8581d5f2c88d18d7905b9ff6ba9956f506
diff --git a/trunk/drivers/w1/slaves/w1_bq27000.c b/trunk/drivers/w1/slaves/w1_bq27000.c
index 8f10fd2630a0..50d9af708b29 100644
--- a/trunk/drivers/w1/slaves/w1_bq27000.c
+++ b/trunk/drivers/w1/slaves/w1_bq27000.c
@@ -45,9 +45,6 @@ static int w1_bq27000_read(struct device *dev, unsigned int reg)
 	u8 val;
 	struct w1_slave *sl = container_of(dev->parent, struct w1_slave, dev);
 
-	if (!dev)
-		return 0;
-
 	w1_write_8(sl->master, HDQ_CMD_READ | reg);
 	val = w1_read_8(sl->master);