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