diff options
-rw-r--r-- | drivers/regulator/bq24022.c | 3 | ||||
-rw-r--r-- | include/linux/regulator/bq24022.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c index 6804333492eb..7ecb820ceebc 100644 --- a/drivers/regulator/bq24022.c +++ b/drivers/regulator/bq24022.c | |||
@@ -105,7 +105,8 @@ static int __init bq24022_probe(struct platform_device *pdev) | |||
105 | ret = gpio_direction_output(pdata->gpio_iset2, 0); | 105 | ret = gpio_direction_output(pdata->gpio_iset2, 0); |
106 | ret = gpio_direction_output(pdata->gpio_nce, 1); | 106 | ret = gpio_direction_output(pdata->gpio_nce, 1); |
107 | 107 | ||
108 | bq24022 = regulator_register(&bq24022_desc, &pdev->dev, NULL, pdata); | 108 | bq24022 = regulator_register(&bq24022_desc, &pdev->dev, |
109 | pdata->init_data, pdata); | ||
109 | if (IS_ERR(bq24022)) { | 110 | if (IS_ERR(bq24022)) { |
110 | dev_dbg(&pdev->dev, "couldn't register regulator\n"); | 111 | dev_dbg(&pdev->dev, "couldn't register regulator\n"); |
111 | ret = PTR_ERR(bq24022); | 112 | ret = PTR_ERR(bq24022); |
diff --git a/include/linux/regulator/bq24022.h b/include/linux/regulator/bq24022.h index e84b0a9feda5..a6d014005d49 100644 --- a/include/linux/regulator/bq24022.h +++ b/include/linux/regulator/bq24022.h | |||
@@ -10,6 +10,8 @@ | |||
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | 12 | ||
13 | struct regulator_init_data; | ||
14 | |||
13 | /** | 15 | /** |
14 | * bq24022_mach_info - platform data for bq24022 | 16 | * bq24022_mach_info - platform data for bq24022 |
15 | * @gpio_nce: GPIO line connected to the nCE pin, used to enable / disable charging | 17 | * @gpio_nce: GPIO line connected to the nCE pin, used to enable / disable charging |
@@ -18,4 +20,5 @@ | |||
18 | struct bq24022_mach_info { | 20 | struct bq24022_mach_info { |
19 | int gpio_nce; | 21 | int gpio_nce; |
20 | int gpio_iset2; | 22 | int gpio_iset2; |
23 | struct regulator_init_data *init_data; | ||
21 | }; | 24 | }; |