diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
| commit | 241bc82e62b28fdb7223b85180fd814f4963c971 (patch) | |
| tree | f0d1a3889fd027e017faa37fc34bffe2fa038c41 /sound/core/control.c | |
| parent | ALSA: firewire-motu: add support for MOTU Audio Express (diff) | |
| parent | ALSA: core: Fix unexpected error at replacing user TLV (diff) | |
| download | wireguard-linux-241bc82e62b28fdb7223b85180fd814f4963c971.tar.xz wireguard-linux-241bc82e62b28fdb7223b85180fd814f4963c971.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/core/control.c
Diffstat (limited to 'sound/core/control.c')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 249140c15d64..de976a8c0177 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; |