From 6930db1e989c79ce3d7b77609efffc4b5183fe4b Mon Sep 17 00:00:00 2001 From: Mikko Perttunen Date: Tue, 18 Jun 2013 13:30:13 +0300 Subject: regulator: tps51632: Get regulator name from i2c_client Commit "i2c: core: make it possible to match a pure device tree driver" changed semantics of the i2c probing for device tree devices. Device tree probed devices now get a NULL i2c_device_id pointer. This causes the regulator name to be set to NULL and the regulator registration to fail. Signed-off-by: Mikko Perttunen Signed-off-by: Mark Brown --- drivers/regulator/tps51632-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c index b0a3f0917a27..3486be935bec 100644 --- a/drivers/regulator/tps51632-regulator.c +++ b/drivers/regulator/tps51632-regulator.c @@ -305,7 +305,7 @@ static int tps51632_probe(struct i2c_client *client, } tps->dev = &client->dev; - tps->desc.name = id->name; + tps->desc.name = client->name; tps->desc.id = 0; tps->desc.ramp_delay = TPS51632_DEFAULT_RAMP_DELAY; tps->desc.min_uV = TPS51632_MIN_VOLATGE; -- cgit v1.2.3