summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-09 19:59:03 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-09 19:59:02 -0800
commit98a2f941e2d5b6924ee36cc584be930782edac20 (patch)
tree6165a0d5cc7435227eaf0af99b661e837d6d6078
parent301af28cab5cfba00edf9c46e75af42ac0c21aa7 (diff)
parent15895e937f1580d2ef346f95a336ba571ac856ac (diff)
Merge "msm-core: use get_user() API to read userspace data/settings"
-rw-r--r--drivers/power/qcom/msm-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/qcom/msm-core.c b/drivers/power/qcom/msm-core.c
index 727a768e63eb..3ac4611da9bd 100644
--- a/drivers/power/qcom/msm-core.c
+++ b/drivers/power/qcom/msm-core.c
@@ -486,9 +486,9 @@ static long msm_core_ioctl(struct file *file, unsigned int cmd,
return -EINVAL;
get_user(cluster, &argp->cluster);
- mpidr = (argp->cluster << (MAX_CORES_PER_CLUSTER *
+ mpidr = (cluster << (MAX_CORES_PER_CLUSTER *
MAX_NUM_OF_CLUSTERS));
- cpumask = argp->cpumask;
+ get_user(cpumask, &argp->cpumask);
switch (cmd) {
case EA_LEAKAGE: