diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-11 11:45:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-11 11:45:25 -0400 |
| commit | 18d633617bd05c7b6556745318fffec6db7a9128 (patch) | |
| tree | c3390be8570611863d6827455c381069a116921c | |
| parent | 6230a61940f032ef7cfa705b4ff42ba4fd5d4c72 (diff) | |
| download | longterm-queue-2.6.34-18d633617bd05c7b6556745318fffec6db7a9128.tar.gz | |
mips: fix watchdog-mtx1 build failure
scripts/buildcommits found this regression; the same problem hit the
2.6.32 stable tree, so make use of the same fix methodology here.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/watchdog-mtx1-wdt-request-gpio-before-using-it.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/watchdog-mtx1-wdt-request-gpio-before-using-it.patch b/queue/watchdog-mtx1-wdt-request-gpio-before-using-it.patch index a59445d..4f589be 100644 --- a/queue/watchdog-mtx1-wdt-request-gpio-before-using-it.patch +++ b/queue/watchdog-mtx1-wdt-request-gpio-before-using-it.patch @@ -1,4 +1,4 @@ -From 937bf462978f81f1b366e5eb2fc907ecd1c4c129 Mon Sep 17 00:00:00 2001 +From b5da83ce0f25025fc2a65142d3be1752e7988d6d Mon Sep 17 00:00:00 2001 From: Florian Fainelli <florian@openwrt.org> Date: Wed, 15 Jun 2011 19:15:23 +0200 Subject: [PATCH] watchdog: mtx1-wdt: request gpio before using it @@ -13,29 +13,29 @@ autorequest GPIO-215 Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> +[PG: use combo gpio_request+gpio_direction_output vs. gpio_request_one + to avoid build failure, as per v2.6.32.47 commit 35b6863ce555c ] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - drivers/watchdog/mtx-1_wdt.c | 8 ++++++++ - 1 file changed, 8 insertions(+) diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c -index 08e8a6a..e797a2c 100644 +index 08e8a6a..c9dbe11 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c -@@ -211,6 +211,12 @@ static int __devinit mtx1_wdt_probe(struct platform_device *pdev) +@@ -211,6 +211,13 @@ 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); -@@ -236,6 +242,8 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev) +@@ -236,6 +243,8 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev) mtx1_wdt_device.queue = 0; wait_for_completion(&mtx1_wdt_device.stop); } |