diff options
| author | Mikko Perttunen <mperttunen@nvidia.com> | 2013-06-18 13:30:13 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 13:57:15 +0000 |
| commit | 6930db1e989c79ce3d7b77609efffc4b5183fe4b (patch) | |
| tree | 7096425a9e0332022c7bbfa5be44044b23741844 /drivers/regulator | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| download | linux-stable-6930db1e989c79ce3d7b77609efffc4b5183fe4b.tar.gz linux-stable-6930db1e989c79ce3d7b77609efffc4b5183fe4b.tar.bz2 linux-stable-6930db1e989c79ce3d7b77609efffc4b5183fe4b.zip | |
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 <mperttunen@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps51632-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |