diff options
| author | Arve Hjønnevåg <arve@android.com> | 2010-01-06 17:17:33 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:14 -0800 |
| commit | cb998242b787ce18ff0f7976ae428d114bd4ce7a (patch) | |
| tree | b0493aecc630086c67c272691ae927d8fa964354 /drivers/staging | |
| parent | 6b9496e22d34d37656d68353b80322fb4f36183d (diff) | |
Staging: android: timed_gpio: Request gpios.
Change-Id: I9e98250a04e5505ce2db2edd355e8fdf8391cabd
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/timed_gpio.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c index be7cdaa783ae..a646107da26d 100644 --- a/drivers/staging/android/timed_gpio.c +++ b/drivers/staging/android/timed_gpio.c @@ -106,10 +106,17 @@ static int timed_gpio_probe(struct platform_device *pdev) gpio_dat->dev.name = cur_gpio->name; gpio_dat->dev.get_time = gpio_get_time; gpio_dat->dev.enable = gpio_enable; - ret = timed_output_dev_register(&gpio_dat->dev); + ret = gpio_request(cur_gpio->gpio, cur_gpio->name); + if (ret >= 0) { + ret = timed_output_dev_register(&gpio_dat->dev); + if (ret < 0) + gpio_free(cur_gpio->gpio); + } if (ret < 0) { - for (j = 0; j < i; j++) + for (j = 0; j < i; j++) { timed_output_dev_unregister(&gpio_data[i].dev); + gpio_free(gpio_data[i].gpio); + } kfree(gpio_data); return ret; } @@ -131,8 +138,10 @@ static int timed_gpio_remove(struct platform_device *pdev) struct timed_gpio_data *gpio_data = platform_get_drvdata(pdev); int i; - for (i = 0; i < pdata->num_gpios; i++) + for (i = 0; i < pdata->num_gpios; i++) { timed_output_dev_unregister(&gpio_data[i].dev); + gpio_free(gpio_data[i].gpio); + } kfree(gpio_data); |