From 861c1dd3393c158676dad7458552cb1b9d11c411 Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Sat, 5 May 2007 15:53:15 +0200 Subject: [PATCH] --- yaml --- r: 55874 b: refs/heads/master c: 62be074147fe2e24359d76a33938df7bccea1e6a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/s3c2410_wdt.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4b94c1af9227..20854e86adf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 261259b2a8c2924cbe591697e740654734ec0f7b +refs/heads/master: 62be074147fe2e24359d76a33938df7bccea1e6a diff --git a/trunk/drivers/char/watchdog/s3c2410_wdt.c b/trunk/drivers/char/watchdog/s3c2410_wdt.c index dff6cb5dc9a7..20fa29ca7404 100644 --- a/trunk/drivers/char/watchdog/s3c2410_wdt.c +++ b/trunk/drivers/char/watchdog/s3c2410_wdt.c @@ -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;