| Message ID | 1383217687-12037-5-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Commit | 0859ffc3b3cb673ac1d3f33b0265cf60d1e3836d |
| Headers | show |
On Thu, Oct 31, 2013 at 04:38:06PM +0530, Tushar Behera wrote: > Signed-off-by: Tushar Behera <tushar.behera@linaro.org> > CC: linux-watchdog@vger.kernel.org > CC: Wim Van Sebroeck <wim@iguana.be> > --- > drivers/watchdog/rt2880_wdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c > index a9f8491..53d37fe 100644 > --- a/drivers/watchdog/rt2880_wdt.c > +++ b/drivers/watchdog/rt2880_wdt.c > @@ -144,7 +144,7 @@ static int rt288x_wdt_probe(struct platform_device *pdev) > int ret; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - rt288x_wdt_base = devm_request_and_ioremap(&pdev->dev, res); > + rt288x_wdt_base = devm_ioremap_resource(&pdev->dev, res); > if (IS_ERR(rt288x_wdt_base)) > return PTR_ERR(rt288x_wdt_base); > Wim already applied a similar patch from Wei Yongjun to his -next tree Guenter
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c index a9f8491..53d37fe 100644 --- a/drivers/watchdog/rt2880_wdt.c +++ b/drivers/watchdog/rt2880_wdt.c @@ -144,7 +144,7 @@ static int rt288x_wdt_probe(struct platform_device *pdev) int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - rt288x_wdt_base = devm_request_and_ioremap(&pdev->dev, res); + rt288x_wdt_base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(rt288x_wdt_base)) return PTR_ERR(rt288x_wdt_base);
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: linux-watchdog@vger.kernel.org CC: Wim Van Sebroeck <wim@iguana.be> --- drivers/watchdog/rt2880_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)