drivers/rtc/rtc-max8997.c: fix incorrect return value on error
'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>
This commit is contained in:
committed by
Linus Torvalds
parent
dbda161be8
commit
406dc00407
@@ -491,6 +491,7 @@ static int max8997_rtc_probe(struct platform_device *pdev)
|
|||||||
virq = irq_create_mapping(max8997->irq_domain, MAX8997_PMICIRQ_RTCA1);
|
virq = irq_create_mapping(max8997->irq_domain, MAX8997_PMICIRQ_RTCA1);
|
||||||
if (!virq) {
|
if (!virq) {
|
||||||
dev_err(&pdev->dev, "Failed to create mapping alarm IRQ\n");
|
dev_err(&pdev->dev, "Failed to create mapping alarm IRQ\n");
|
||||||
|
ret = -ENXIO;
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
info->virq = virq;
|
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,
|
ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
|
||||||
max8997_rtc_alarm_irq, 0,
|
max8997_rtc_alarm_irq, 0,
|
||||||
"rtc-alarm0", info);
|
"rtc-alarm0", info);
|
||||||
if (ret < 0) {
|
if (ret < 0)
|
||||||
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
|
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
|
||||||
info->virq, ret);
|
info->virq, ret);
|
||||||
goto err_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
err_out:
|
err_out:
|
||||||
return ret;
|
return ret;
|
||||||
|
Reference in New Issue
Block a user