diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 22:50:59 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 22:50:59 +0400 |
commit | 924ee2c9621b65df9dffa8218af5ee9a9b892bba (patch) | |
tree | 316d72848181d4198dad3407ba5441083708ab7e /drivers/regulator/ad5398.c | |
parent | 68aaa37d0e8232d62a7e9411699e0dc005750186 (diff) | |
parent | 69511a452e6dc6b74fe4f3671a51b1b44b9c57e3 (diff) | |
download | linux-924ee2c9621b65df9dffa8218af5ee9a9b892bba.tar.xz |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator/ad5398.c')
-rw-r--r-- | drivers/regulator/ad5398.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index a4be41614eeb..483c80930852 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c @@ -233,7 +233,7 @@ static int __devinit ad5398_probe(struct i2c_client *client, chip->current_mask = (chip->current_level - 1) << chip->current_offset; chip->rdev = regulator_register(&ad5398_reg, &client->dev, - init_data, chip); + init_data, chip, NULL); if (IS_ERR(chip->rdev)) { ret = PTR_ERR(chip->rdev); dev_err(&client->dev, "failed to register %s %s\n", |