diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-04 14:31:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-04 14:31:00 +0200 |
| commit | 59f979455d7209171ab10a72c8df5c2512976cb4 (patch) | |
| tree | c4c7fc48bd79bf8acbe848a1b979fa9e8ab4ac6a /drivers/extcon/extcon_gpio.c | |
| parent | b9bb50db9126c4ccad78af2dfb77277ca17c9b64 (diff) | |
| parent | 9450d57eab5cad36774c297da123062744472588 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in the current fixes branch, we are going to apply dependent patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/extcon/extcon_gpio.c')
| -rw-r--r-- | drivers/extcon/extcon_gpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/extcon/extcon_gpio.c b/drivers/extcon/extcon_gpio.c index fe3db45fa83c..3cc152e690b0 100644 --- 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; |