Commit 60a1aa50 authored by Viresh Kumar's avatar Viresh Kumar Committed by Wim Van Sebroeck

watchdog: mpcore_wdt: Allow platform_get_irq() to fail

irq is not necessary for mpcore wdt. Don't return error if it is not passed. But
if it is passed, then request_irq must pass.
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 75f5a536
...@@ -347,15 +347,15 @@ static int __devinit mpcore_wdt_probe(struct platform_device *pdev) ...@@ -347,15 +347,15 @@ static int __devinit mpcore_wdt_probe(struct platform_device *pdev)
wdt->dev = &pdev->dev; wdt->dev = &pdev->dev;
wdt->irq = platform_get_irq(pdev, 0); wdt->irq = platform_get_irq(pdev, 0);
if (wdt->irq < 0) if (wdt->irq >= 0) {
return -ENXIO; ret = devm_request_irq(wdt->dev, wdt->irq, mpcore_wdt_fire, 0,
"mpcore_wdt", wdt);
ret = devm_request_irq(wdt->dev, wdt->irq, mpcore_wdt_fire, 0, if (ret) {
"mpcore_wdt", wdt); dev_printk(KERN_ERR, wdt->dev,
if (ret) { "cannot register IRQ%d for watchdog\n",
dev_printk(KERN_ERR, wdt->dev, wdt->irq);
"cannot register IRQ%d for watchdog\n", wdt->irq); return ret;
return ret; }
} }
wdt->base = devm_ioremap(wdt->dev, res->start, resource_size(res)); wdt->base = devm_ioremap(wdt->dev, res->start, resource_size(res));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment