diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 23:07:53 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 23:07:53 -0800 |
| commit | ad077ceb8a90c7ef1fc15758ed3811448181ee80 (patch) | |
| tree | dc090e24bb82c41c3785e539b9e60df6c48abfaf /drivers/mfd/tps65217.c | |
| parent | c05ab9a0cc8e2b958bb2db2f8f1d200e568a75d4 (diff) | |
| parent | 10b7cdc0084c27a312e59e80420c6aac70c64753 (diff) | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/mfd/tps65217.c')
| -rw-r--r-- | drivers/mfd/tps65217.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c index 966cf65c5c36..3cc4c7084b92 100644 --- a/drivers/mfd/tps65217.c +++ b/drivers/mfd/tps65217.c @@ -158,7 +158,7 @@ static int tps65217_probe(struct i2c_client *client, { struct tps65217 *tps; unsigned int version; - unsigned int chip_id = ids->driver_data; + unsigned long chip_id = ids->driver_data; const struct of_device_id *match; bool status_off = false; int ret; @@ -170,7 +170,7 @@ static int tps65217_probe(struct i2c_client *client, "Failed to find matching dt id\n"); return -EINVAL; } - chip_id = (unsigned int)(unsigned long)match->data; + chip_id = (unsigned long)match->data; status_off = of_property_read_bool(client->dev.of_node, "ti,pmic-shutdown-controller"); } |