Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index bfbd92c8d1c9..77823d21d314 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -476,13 +476,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
         s3c_rtc_tickno = platform_get_irq(pdev, 1);
         if (s3c_rtc_tickno < 0) {
                 dev_err(&pdev->dev, "no irq for rtc tick\n");
-                return -ENOENT;
+                return s3c_rtc_tickno;
         }
 
         s3c_rtc_alarmno = platform_get_irq(pdev, 0);
         if (s3c_rtc_alarmno < 0) {
                 dev_err(&pdev->dev, "no irq for alarm\n");
-                return -ENOENT;
+                return s3c_rtc_alarmno;
         }
 
         pr_debug("s3c2410_rtc: tick irq %d, alarm irq %d\n",