[merged] drivers-rtc-rtc-max8997c-fix-incorrect-return-value-on-error.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: drivers/rtc/rtc-max8997.c: fix incorrect return value on error
has been removed from the -mm tree.  Its filename was
     drivers-rtc-rtc-max8997c-fix-incorrect-return-value-on-error.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Jonghwa Lee <jonghwa3.lee@xxxxxxxxxxx>
Cc: Chiwoong Byun <woong.byun@xxxxxxxxxxx>
Cc: Laxman dewangan <ldewangan@xxxxxxxxxx>
Cc: Venu Byravarasu <vbyravarasu@xxxxxxxxxx>
Cc: Jingoo Han <jg1.han@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/rtc-max8997.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff -puN drivers/rtc/rtc-max8997.c~drivers-rtc-rtc-max8997c-fix-incorrect-return-value-on-error drivers/rtc/rtc-max8997.c
--- a/drivers/rtc/rtc-max8997.c~drivers-rtc-rtc-max8997c-fix-incorrect-return-value-on-error
+++ a/drivers/rtc/rtc-max8997.c
@@ -491,6 +491,7 @@ static int max8997_rtc_probe(struct plat
 	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 plat
 	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;
_

Patches currently in -mm which might be from sachin.kamat@xxxxxxxxxx are

origin.patch
linux-next.patch
drivers-rtc-rtc-pxac-use-devm_-apis.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux