]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drivers/rtc/rtc-max8997.c: fix incorrect return value on error
authorSachin Kamat <sachin.kamat@linaro.org>
Mon, 29 Apr 2013 23:20:11 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:34 +0000 (18:28 -0700)
'ret' was being returned without initializing it to error code.  While at
it also remove duplicate return statement.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Jonghwa Lee <jonghwa3.lee@samsung.com>
Cc: Chiwoong Byun <woong.byun@samsung.com>
Cc: Laxman dewangan <ldewangan@nvidia.com>
Cc: Venu Byravarasu <vbyravarasu@nvidia.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-max8997.c

index d12acc49c822d0a188e95d10cdfca12ca100a161..5693619614f48932f8676a648ba3790faded6419 100644 (file)
@@ -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;