Merge "drivers: soc: qcom: Add error handling in function avtimer_ioctl" (351c0011) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/avtimer.c

+11 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -331,9 +331,17 @@ static long avtimer_ioctl(struct file *file, unsigned int ioctl_num,
		switch (ioctl_num) {
		case IOCTL_GET_AVTIMER_TICK:
		{
		uint64_t avtimer_tick;
		uint64_t avtimer_tick = 0;
		int rc;

		rc = avcs_core_query_timer(&avtimer_tick);

		if (rc) {
		pr_err("%s: Error: Invalid AV Timer tick, rc = %d\n",
		__func__, rc);
		return rc;
		}

		avcs_core_query_timer(&avtimer_tick);
		pr_debug_ratelimited("%s: AV Timer tick: time %llx\n",
		__func__, avtimer_tick);
		if (copy_to_user((void *) ioctl_param, &avtimer_tick,