Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4042a147 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: mv: correct 24 hour error message 



The driver can't accommodate the 12 hour mode but the error message states
that the 24 hour mode is not supported.
Also fix the typos (hour vs hours).

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent fe561336

drivers/rtc/rtc-mv.c

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int mv_rtc_read_time(struct device *dev, struct rtc_time *tm) 


	second = rtc_time & 0x7f;

	minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f;

	hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hours mode */

	hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hour mode */

	wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7;



	day = rtc_date & 0x3f;
@@ -109,7 +109,7 @@ static int mv_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) 


	second = rtc_time & 0x7f;

	minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f;

	hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hours mode */

	hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hour mode */

	wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7;



	day = rtc_date & 0x3f;
@@ -240,10 +240,10 @@ static int __init mv_rtc_probe(struct platform_device *pdev) 
	if (!IS_ERR(pdata->clk))

		clk_prepare_enable(pdata->clk);



	/* make sure the 24 hours mode is enabled */

	/* make sure the 24 hour mode is enabled */

	rtc_time = readl(pdata->ioaddr + RTC_TIME_REG_OFFS);

	if (rtc_time & RTC_HOURS_12H_MODE) {

		dev_err(&pdev->dev, "24 Hours mode not supported.\n");

		dev_err(&pdev->dev, "12 Hour mode is enabled but not supported.\n");

		ret = -EINVAL;

		goto out;

	}