|
@@ -67,7 +67,7 @@ static int set_rtc_mmss(unsigned long nowtime)
|
|
|
|
|
|
cmos_minutes = CMOS_READ(RTC_MINUTES);
|
|
cmos_minutes = CMOS_READ(RTC_MINUTES);
|
|
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
|
|
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
|
|
- BCD_TO_BIN(cmos_minutes);
|
|
|
|
|
|
+ cmos_minutes = bcd2bin(cmos_minutes);
|
|
|
|
|
|
/*
|
|
/*
|
|
* since we're only adjusting minutes and seconds,
|
|
* since we're only adjusting minutes and seconds,
|
|
@@ -84,8 +84,8 @@ static int set_rtc_mmss(unsigned long nowtime)
|
|
|
|
|
|
if (abs(real_minutes - cmos_minutes) < 30) {
|
|
if (abs(real_minutes - cmos_minutes) < 30) {
|
|
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
|
|
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
|
|
- BIN_TO_BCD(real_seconds);
|
|
|
|
- BIN_TO_BCD(real_minutes);
|
|
|
|
|
|
+ real_seconds = bin2bcd(real_seconds);
|
|
|
|
+ real_minutes = bin2bcd(real_minutes);
|
|
}
|
|
}
|
|
CMOS_WRITE(real_seconds, RTC_SECONDS);
|
|
CMOS_WRITE(real_seconds, RTC_SECONDS);
|
|
CMOS_WRITE(real_minutes, RTC_MINUTES);
|
|
CMOS_WRITE(real_minutes, RTC_MINUTES);
|