diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-20 07:53:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-20 07:53:07 +0200 |
| commit | 7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8 (patch) | |
| tree | 6c5c7d9e05ef0d494265ef924ac909c959101fba /sound/core | |
| parent | 8cad7a3db658a0652e4ced46dc44fbc7872f0823 (diff) | |
| parent | c7ecb9068e6772c43941ce609f08bc53f36e1dce (diff) | |
| download | linux-rpi-7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8.tar.gz linux-rpi-7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8.tar.bz2 linux-rpi-7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8.zip | |
Merge branch 'for-linus' into for-next
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 461c21f21caf..e8131c060c86 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -2329,7 +2329,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) @@ -2361,7 +2361,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; |