* [PATCH -stable] watchdog: mtx1-wdt: fix build failure
@ 2011-10-17 17:47 Florian Fainelli
2011-11-02 21:10 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2011-10-17 17:47 UTC (permalink / raw)
To: Wim Van Sebroeck, Greg KH, linux-watchdog
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.
CC: stable@kernel.org
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
This patch is applicable from 2.6.32+ to 2.6.33+ included.
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index e797a2c..c9dbe11 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -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;
--
1.7.5.4
--
Florian
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH -stable] watchdog: mtx1-wdt: fix build failure
2011-10-17 17:47 [PATCH -stable] watchdog: mtx1-wdt: fix build failure Florian Fainelli
@ 2011-11-02 21:10 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2011-11-02 21:10 UTC (permalink / raw)
To: Florian Fainelli; +Cc: Wim Van Sebroeck, Greg KH, linux-watchdog
On Mon, Oct 17, 2011 at 07:47:44PM +0200, Florian Fainelli wrote:
> 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.
>
> CC: stable@kernel.org
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> This patch is applicable from 2.6.32+ to 2.6.33+ included.
Thanks, now applied.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-02 21:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-17 17:47 [PATCH -stable] watchdog: mtx1-wdt: fix build failure Florian Fainelli
2011-11-02 21:10 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).