diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-05 15:26:30 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-05 15:26:30 +0300 |
commit | 6374fda1472524deaa492da1ce0adca600343996 (patch) | |
tree | 7d18c7eff2d1b19eb10920ec3244592bf1f04d80 /sound/soc/intel/skylake | |
parent | 1c750eb580d332f740af456748de4b206e442c3b (diff) | |
parent | 508ddfba37cad76d774da8f8d8e2387f0eca5fa4 (diff) | |
download | linux-6374fda1472524deaa492da1ce0adca600343996.tar.xz |
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.c | 2 |
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 a294fee431f0..5a4837dcfce3 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; } |