2.6.38-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Mike Frysinger <[email protected]>

commit 8c122b96866580c99e44f3f07ac93a993d964ec3 upstream.

The new bfin_rtc_alarm_irq_enable function forgot to add a "return 0" to
the end leading to the build warning:
        drivers/rtc/rtc-bfin.c: In function 'bfin_rtc_alarm_irq_enable':
        drivers/rtc/rtc-bfin.c:253: warning: control reaches end of non-void 
function

CC: Thomas Gleixner <[email protected]>
CC: Alessandro Zummo <[email protected]>
Signed-off-by: Mike Frysinger <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/rtc/rtc-bfin.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -276,6 +276,8 @@ static int bfin_rtc_alarm_irq_enable(str
                bfin_rtc_int_set_alarm(rtc);
        else
                bfin_rtc_int_clear(~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));
+
+       return 0;
 }
 
 static int bfin_rtc_read_time(struct device *dev, struct rtc_time *tm)


_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to