diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-24 08:57:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-24 08:57:20 +0200 |
| commit | 1bc3cd4dfa9f2f5385ee15de2301d25e51cf43f0 (patch) | |
| tree | cd38acbcaeea1520a598cf8978002a07c2a5993b /sound/core | |
| parent | 8887cd99038bf242fb47f2d07fa0cf9371efa643 (diff) | |
| parent | 94a6df251dd08c6436ebd6d10c68f03659148ce1 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index dd5254077ef7..877176067072 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -2492,7 +2492,7 @@ static int pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol, struct snd_pcm_substream *substream; const struct snd_pcm_chmap_elem *map; - if (snd_BUG_ON(!info->chmap)) + if (!info->chmap) return -EINVAL; substream = snd_pcm_chmap_substream(info, idx); if (!substream) @@ -2524,7 +2524,7 @@ static int pcm_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag, unsigned int __user *dst; int c, count = 0; - if (snd_BUG_ON(!info->chmap)) + if (!info->chmap) return -EINVAL; if (size < 8) return -ENOMEM; |