From 00a277e7e52c440f3a9f65d06f93d35797da4571 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Fri, 7 Dec 2012 15:44:46 -0700 Subject: [PATCH] --- yaml --- r: 348001 b: refs/heads/master c: 8c4c419ca3bd5a5b3389114e037a9d17bdec3a5f h: refs/heads/master i: 347999: dec43ae8d2a4449f0e546715d74dd46366102939 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/orion_wdt.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index af5691c9b8ac..a38b6b5c4fda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 740fbddf5c3f9ad8b23c5d917ba1cc7e376a5104 +refs/heads/master: 8c4c419ca3bd5a5b3389114e037a9d17bdec3a5f diff --git a/trunk/drivers/watchdog/orion_wdt.c b/trunk/drivers/watchdog/orion_wdt.c index 0478b001b1ef..7c18b3bffcf7 100644 --- a/trunk/drivers/watchdog/orion_wdt.c +++ b/trunk/drivers/watchdog/orion_wdt.c @@ -156,6 +156,8 @@ static int orion_wdt_probe(struct platform_device *pdev) wdt_tclk = clk_get_rate(clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; wdt_reg = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (!wdt_reg) return -ENOMEM;