Subject: [merged] drivers-rtc-rtc-stmp3xxxc-check-the-return-value-from-stmp_reset_block.patch removed from -mm tree To: fabio.estevam@xxxxxxxxxxxxx,shawn.guo@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 09 Jul 2013 16:20:59 -0700 The patch titled Subject: drivers/rtc/rtc-stmp3xxx.c: check the return value from stmp_reset_block() has been removed from the -mm tree. Its filename was drivers-rtc-rtc-stmp3xxxc-check-the-return-value-from-stmp_reset_block.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Subject: drivers/rtc/rtc-stmp3xxx.c: check the return value from stmp_reset_block() stmp_reset_block() may fail, so let's check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Acked-by: Shawn Guo <shawn.guo@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-stmp3xxx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN drivers/rtc/rtc-stmp3xxx.c~drivers-rtc-rtc-stmp3xxxc-check-the-return-value-from-stmp_reset_block drivers/rtc/rtc-stmp3xxx.c --- a/drivers/rtc/rtc-stmp3xxx.c~drivers-rtc-rtc-stmp3xxxc-check-the-return-value-from-stmp_reset_block +++ a/drivers/rtc/rtc-stmp3xxx.c @@ -261,7 +261,12 @@ static int stmp3xxx_rtc_probe(struct pla platform_set_drvdata(pdev, rtc_data); - stmp_reset_block(rtc_data->io); + err = stmp_reset_block(rtc_data->io); + if (err) { + dev_err(&pdev->dev, "stmp_reset_block failed: %d\n", err); + return err; + } + writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, _ Patches currently in -mm which might be from fabio.estevam@xxxxxxxxxxxxx are origin.patch linux-next.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