]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
watchdog: mtx1-wdt: fix build failure
authorFlorian Fainelli <florian@openwrt.org>
Mon, 17 Oct 2011 17:47:44 +0000 (19:47 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Nov 2011 20:32:44 +0000 (12:32 -0800)
Commit 6d86a0ee (watchdog: mtx1-wdt: request gpio before using it) was
backported from upstream. The patch is using a gpiolib call which is only
available in kernel 2.6.34+. Fix build by using the "old" gpiolib API
instead.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/watchdog/mtx-1_wdt.c

index e797a2c797d7dadf746387049719b6489448f074..c9dbe11ca620146a3d1118c72c06f602f0f02ac0 100644 (file)
@@ -211,13 +211,14 @@ static int __devinit 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,
-                               GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
+       ret = gpio_request(mtx1_wdt_device.gpio, "mtx1-wdt");
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to request gpio");
                return ret;
        }
 
+       gpio_direction_output(mtx1_wdt_device.gpio, 1);
+
        spin_lock_init(&mtx1_wdt_device.lock);
        init_completion(&mtx1_wdt_device.stop);
        mtx1_wdt_device.queue = 0;