Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 55874
b: refs/heads/master
c: 62be074
h: refs/heads/master
v: v3
  • Loading branch information
Arnaud Patard authored and Wim Van Sebroeck committed May 6, 2007
1 parent bbcbd8e commit 861c1dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 261259b2a8c2924cbe591697e740654734ec0f7b
refs/heads/master: 62be074147fe2e24359d76a33938df7bccea1e6a
6 changes: 3 additions & 3 deletions trunk/drivers/char/watchdog/s3c2410_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,14 @@ static int s3c2410wdt_probe(struct platform_device *pdev)

DBG("probe: mapped wdt_base=%p\n", wdt_base);

res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res == NULL) {
wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (wdt_irq == NULL) {
printk(KERN_INFO PFX "failed to get irq resource\n");
ret = -ENOENT;
goto err_map;
}

ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);
ret = request_irq(wdt_irq->start, s3c2410wdt_irq, 0, pdev->name, pdev);
if (ret != 0) {
printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
goto err_map;
Expand Down

0 comments on commit 861c1dd

Please sign in to comment.