From 16af3228a98777c8b3db9a752de89a1f43b625da Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 29 Apr 2013 16:20:11 -0700 Subject: [PATCH] --- yaml --- r: 365798 b: refs/heads/master c: 406dc00407edfa75c97123c7f8653e850358fb72 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-max8997.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 59973819130e..1f91465940b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbda161be8ae43133bbeac34da3ad99ffeb63556 +refs/heads/master: 406dc00407edfa75c97123c7f8653e850358fb72 diff --git a/trunk/drivers/rtc/rtc-max8997.c b/trunk/drivers/rtc/rtc-max8997.c index d12acc49c822..5693619614f4 100644 --- a/trunk/drivers/rtc/rtc-max8997.c +++ b/trunk/drivers/rtc/rtc-max8997.c @@ -491,6 +491,7 @@ static int max8997_rtc_probe(struct platform_device *pdev) virq = irq_create_mapping(max8997->irq_domain, MAX8997_PMICIRQ_RTCA1); if (!virq) { dev_err(&pdev->dev, "Failed to create mapping alarm IRQ\n"); + ret = -ENXIO; goto err_out; } info->virq = virq; @@ -498,13 +499,9 @@ static int max8997_rtc_probe(struct platform_device *pdev) ret = devm_request_threaded_irq(&pdev->dev, virq, NULL, max8997_rtc_alarm_irq, 0, "rtc-alarm0", info); - if (ret < 0) { + if (ret < 0) dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", info->virq, ret); - goto err_out; - } - - return ret; err_out: return ret;