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

Commit 4bcbfff6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'fortglx/3.0/tip/timers/rtc' of... 

Merge branch 'fortglx/3.0/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
parents 1c3cc116 d576fe49

drivers/rtc/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) 
}

EXPORT_SYMBOL_GPL(rtc_read_alarm);



int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)

static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)

{

	struct rtc_time tm;

	long now, scheduled;

drivers/rtc/rtc-dev.c

+2 −1
Original line number Diff line number Diff line
@@ -421,7 +421,8 @@ static long rtc_dev_ioctl(struct file *file, 
			err = ops->ioctl(rtc->dev.parent, cmd, arg);

			if (err == -ENOIOCTLCMD)

				err = -ENOTTY;

		}

		} else

			err = -ENOTTY;

		break;

	}