git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://1984.lsi.us.es/nf
[pandora-kernel.git]
/
drivers
/
extcon
/
extcon_gpio.c
diff --git
a/drivers/extcon/extcon_gpio.c
b/drivers/extcon/extcon_gpio.c
index
fe3db45
..
3cc152e
100644
(file)
--- a/
drivers/extcon/extcon_gpio.c
+++ b/
drivers/extcon/extcon_gpio.c
@@
-107,7
+107,8
@@
static int __devinit gpio_extcon_probe(struct platform_device *pdev)
if (ret < 0)
return ret;
- ret = gpio_request_one(extcon_data->gpio, GPIOF_DIR_IN, pdev->name);
+ ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
+ pdev->name);
if (ret < 0)
goto err;