diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:11 +0100 |
| commit | 70083c4c8c60d9ddc188f51e0960574badc919af (patch) | |
| tree | b658f08cedfe7b8b4b47f3941748b143085071bd /drivers | |
| parent | 60908305fb47058bfd1d621bd65ee4dd90f5f2a9 (diff) | |
| parent | 0a62d03b4844988c5477f13bd17c3553f816ce87 (diff) | |
| download | op-kernel-dev-70083c4c8c60d9ddc188f51e0960574badc919af.zip op-kernel-dev-70083c4c8c60d9ddc188f51e0960574badc919af.tar.gz | |
Merge remote-tracking branch 'regulator/topic/tps62360' into regulator-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/tps62360-regulator.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c index 612919c..a490d5b 100644 --- a/drivers/regulator/tps62360-regulator.c +++ b/drivers/regulator/tps62360-regulator.c @@ -351,7 +351,6 @@ static int tps62360_probe(struct i2c_client *client, int chip_id; pdata = client->dev.platform_data; - chip_id = id->driver_data; if (client->dev.of_node) { const struct of_device_id *match; @@ -364,6 +363,11 @@ static int tps62360_probe(struct i2c_client *client, chip_id = (int)match->data; if (!pdata) pdata = of_get_tps62360_platform_data(&client->dev); + } else if (id) { + chip_id = id->driver_data; + } else { + dev_err(&client->dev, "No device tree match or id table match found\n"); + return -ENODEV; } if (!pdata) { @@ -402,7 +406,7 @@ static int tps62360_probe(struct i2c_client *client, return -ENODEV; } - tps->desc.name = id->name; + tps->desc.name = client->name; tps->desc.id = 0; tps->desc.ops = &tps62360_dcdc_ops; tps->desc.type = REGULATOR_VOLTAGE; |
