* [PATCH 2/5 v2] WATCHDOG: mtx1-wdt: request gpio before using it
@ 2011-06-12 16:56 Florian Fainelli
2011-06-13 9:24 ` Jamie Iles
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2011-06-12 16:56 UTC (permalink / raw)
To: Wim Van Sebroeck, linux-mips, linux-watchdog, Manuel Lauss,
Jamie Iles, stable
Otherwise, the gpiolib autorequest feature will produce a WARN_ON():
WARNING: at drivers/gpio/gpiolib.c:101 0x8020ec6c()
autorequest GPIO-215
[...]
CC:stable@kernel.org
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Changes since v1:
- use gpio_request_one()
- added missing gpio_free() in mtx1_wdt_remove
Stable: [2.6.39+]
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 63df28c..9b63642 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -214,6 +214,12 @@ 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");
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to request gpio");
+ return ret;
+ }
spin_lock_init(&mtx1_wdt_device.lock);
init_completion(&mtx1_wdt_device.stop);
@@ -239,6 +245,8 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
mtx1_wdt_device.queue = 0;
wait_for_completion(&mtx1_wdt_device.stop);
}
+
+ gpio_free(mtx1_wdt_device.gpio);
misc_deregister(&mtx1_wdt_misc);
return 0;
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/5 v2] WATCHDOG: mtx1-wdt: request gpio before using it
2011-06-12 16:56 [PATCH 2/5 v2] WATCHDOG: mtx1-wdt: request gpio before using it Florian Fainelli
@ 2011-06-13 9:24 ` Jamie Iles
0 siblings, 0 replies; 2+ messages in thread
From: Jamie Iles @ 2011-06-13 9:24 UTC (permalink / raw)
To: Florian Fainelli
Cc: Wim Van Sebroeck, linux-mips, linux-watchdog, Manuel Lauss,
Jamie Iles, stable
On Sun, Jun 12, 2011 at 06:56:17PM +0200, Florian Fainelli wrote:
> Otherwise, the gpiolib autorequest feature will produce a WARN_ON():
>
> WARNING: at drivers/gpio/gpiolib.c:101 0x8020ec6c()
> autorequest GPIO-215
> [...]
>
> CC:stable@kernel.org
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
One really minor nit inline but otherwise this series looks fine to me.
Jamie
> Changes since v1:
> - use gpio_request_one()
> - added missing gpio_free() in mtx1_wdt_remove
>
> Stable: [2.6.39+]
>
> diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
> index 63df28c..9b63642 100644
> --- a/drivers/watchdog/mtx-1_wdt.c
> +++ b/drivers/watchdog/mtx-1_wdt.c
> @@ -214,6 +214,12 @@ 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");
Missing an extra space after the comma.
> + if (ret < 0) {
> + dev_err(&pdev->dev, "failed to request gpio");
> + return ret;
> + }
>
> spin_lock_init(&mtx1_wdt_device.lock);
> init_completion(&mtx1_wdt_device.stop);
> @@ -239,6 +245,8 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
> mtx1_wdt_device.queue = 0;
> wait_for_completion(&mtx1_wdt_device.stop);
> }
> +
> + gpio_free(mtx1_wdt_device.gpio);
> misc_deregister(&mtx1_wdt_misc);
> return 0;
> }
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-13 9:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-12 16:56 [PATCH 2/5 v2] WATCHDOG: mtx1-wdt: request gpio before using it Florian Fainelli
2011-06-13 9:24 ` Jamie Iles
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).