Merge "msm-core: Fix potential NULL pointer issue" (e67c4e82) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qcom/msm-core.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -399,13 +399,16 @@ static long msm_core_ioctl(struct file *file, unsigned int cmd,
		struct cpu_activity_info *node = NULL;
		struct sched_params __user argp = (struct sched_params __user )arg;
		int i, cpu = num_possible_cpus();
		int mpidr = (argp->cluster << (MAX_CORES_PER_CLUSTER *
		MAX_NUM_OF_CLUSTERS));
		int cpumask = argp->cpumask;
		int mpidr;
		int cpumask;

		if (!argp)
		return -EINVAL;

		mpidr = (argp->cluster << (MAX_CORES_PER_CLUSTER *
		MAX_NUM_OF_CLUSTERS));
		cpumask = argp->cpumask;

		switch (cmd) {
		case EA_LEAKAGE:
		ret = update_userspace_power(argp);