diff --git a/[refs] b/[refs] index f3f544f9625e..f8fcea06a6d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 794543a236074f49a8af89ef08ef6a753e4777e5 +refs/heads/master: 60ed34be8de04cc8082a163a665e01682c7bc937 diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c index 63c07243993c..7d6876dbcc96 100644 --- a/trunk/drivers/w1/w1.c +++ b/trunk/drivers/w1/w1.c @@ -459,7 +459,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl) (unsigned long long) sl->reg_num.id); dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__, - &sl->dev.bus_id[0]); + &sl->dev.bus_id[0], sl); err = device_register(&sl->dev); if (err < 0) {