summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-05 21:26:30 +0900
committerMark Brown <broonie@kernel.org>2016-03-05 21:26:30 +0900
commit6374fda1472524deaa492da1ce0adca600343996 (patch)
tree7d18c7eff2d1b19eb10920ec3244592bf1f04d80 /sound/soc/intel/skylake
parent1c750eb580d332f740af456748de4b206e442c3b (diff)
parent508ddfba37cad76d774da8f8d8e2387f0eca5fa4 (diff)
downloadop-kernel-dev-6374fda1472524deaa492da1ce0adca600343996.zip
op-kernel-dev-6374fda1472524deaa492da1ce0adca600343996.tar.gz
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound/soc/intel/skylake')
-rw-r--r--sound/soc/intel/skylake/skl-topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index a294fee..5a4837d 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -978,7 +978,7 @@ static int skl_tplg_tlv_control_set(struct snd_kcontrol *kcontrol,
return -EFAULT;
} else {
if (copy_from_user(ac->params,
- data + 2 * sizeof(u32), size))
+ data + 2, size))
return -EFAULT;
}
OpenPOWER on IntegriCloud