commit 241bc82e62b28fdb7223b85180fd814f4963c971
author Takashi Iwai <tiwai@suse.de> Tue Aug 22 15:44:45 2017 +0200
committer Takashi Iwai <tiwai@suse.de> Tue Aug 22 15:44:45 2017 +0200
tree f0d1a3889fd027e017faa37fc34bffe2fa038c41
parent 3a93d082bacf887b47737c4b75c083dea7570832
parent 88c54cdf61f508ebcf8da2d819f5dfc03e954d1d

Merge branch 'for-linus' into for-next

Conflicts:
	sound/core/control.c

sound/core/control.c

diff --git a/sound/core/control.c b/sound/core/control.c
index 249140c..de976a8 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1128,7 +1128,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
 
 	change = ue->tlv_data_size != size;
 	if (!change)
-		change = memcmp(ue->tlv_data, container, size);
+		change = memcmp(ue->tlv_data, container, size) != 0;
 	if (!change) {
 		kfree(container);
 		return 0;