diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 14:41:41 +0700 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 14:41:41 +0700 |
| commit | 016bf20829fa00f5e64805f77b7677365151f4af (patch) | |
| tree | 5ef012a06aaa59e7ee5bbed984322f0a97c37309 /drivers/gpio/gpio-moxart.c | |
| parent | a961f9b472de93e770d53b7340a58dbff64b4075 (diff) | |
| parent | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (diff) | |
Merge branch 'devm-gpiochip-add-data' into devel
Diffstat (limited to 'drivers/gpio/gpio-moxart.c')
| -rw-r--r-- | drivers/gpio/gpio-moxart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c index f7cf5930fbef..f02d0b490978 100644 --- a/drivers/gpio/gpio-moxart.c +++ b/drivers/gpio/gpio-moxart.c @@ -60,7 +60,7 @@ static int moxart_gpio_probe(struct platform_device *pdev) gc->base = 0; gc->owner = THIS_MODULE; - ret = gpiochip_add_data(gc, NULL); + ret = devm_gpiochip_add_data(dev, gc, NULL); if (ret) { dev_err(dev, "%s: gpiochip_add failed\n", dev->of_node->full_name); |