Merge remote-tracking branch 'cifs/for-next'

[karo-tx-linux.git] / drivers / watchdog / mtx-1_wdt.c

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 14dab6ff87aa4816a6f84b76ada07a295f52a4dc..b4341110ad4f43eef5038a9e3d82a7b2644b2ab8 100644 (file)
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -209,7 +209,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
        int ret;
 
        mtx1_wdt_device.gpio = pdev->resource[0].start;
-       ret = gpio_request_one(mtx1_wdt_device.gpio,
+       ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
                                GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to request gpio");
@@ -241,7 +241,6 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
                wait_for_completion(&mtx1_wdt_device.stop);
        }
 
-       gpio_free(mtx1_wdt_device.gpio);
        misc_deregister(&mtx1_wdt_misc);
        return 0;
 }