[Feature] merge MR3.0 because some files are missed
Change-Id: If3617f3442c7d439fde33aa66a4f769c39788b9b
diff --git a/src/kernel/linux/v4.19/drivers/rtc/rtc-mt6330.c b/src/kernel/linux/v4.19/drivers/rtc/rtc-mt6330.c
index d5286da..8190779 100644
--- a/src/kernel/linux/v4.19/drivers/rtc/rtc-mt6330.c
+++ b/src/kernel/linux/v4.19/drivers/rtc/rtc-mt6330.c
@@ -828,7 +828,8 @@
return err;
}
-static int mtk_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+static int mtk_rtc_ioctl(struct device *dev,
+ unsigned int cmd, unsigned long arg)
{
void __user *uarg = (void __user *) arg;
int err = 0;
diff --git a/src/kernel/linux/v4.19/drivers/rtc/rtc-sysfs.c b/src/kernel/linux/v4.19/drivers/rtc/rtc-sysfs.c
index a1dc393..fa36f45 100644
--- a/src/kernel/linux/v4.19/drivers/rtc/rtc-sysfs.c
+++ b/src/kernel/linux/v4.19/drivers/rtc/rtc-sysfs.c
@@ -280,9 +280,9 @@
retval = kstrtos64(buf_ptr, 0, &alarm);
if (retval)
return retval;
- if (adjust) {
+ if (adjust)
alarm += now;
- }
+
if (alarm > now || push) {
/* Avoid accidentally clobbering active alarms; we can't
* entirely prevent that here, without even the minimal