diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-20 01:53:07 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-20 01:53:07 -0400 |
| commit | 7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8 (patch) | |
| tree | 6c5c7d9e05ef0d494265ef924ac909c959101fba /sound/core/pcm_lib.c | |
| parent | 8cad7a3db658a0652e4ced46dc44fbc7872f0823 (diff) | |
| parent | c7ecb9068e6772c43941ce609f08bc53f36e1dce (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/core/pcm_lib.c')
| -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, | |||
| 2329 | struct snd_pcm_substream *substream; | 2329 | struct snd_pcm_substream *substream; |
| 2330 | const struct snd_pcm_chmap_elem *map; | 2330 | const struct snd_pcm_chmap_elem *map; |
| 2331 | 2331 | ||
| 2332 | if (snd_BUG_ON(!info->chmap)) | 2332 | if (!info->chmap) |
| 2333 | return -EINVAL; | 2333 | return -EINVAL; |
| 2334 | substream = snd_pcm_chmap_substream(info, idx); | 2334 | substream = snd_pcm_chmap_substream(info, idx); |
| 2335 | if (!substream) | 2335 | if (!substream) |
| @@ -2361,7 +2361,7 @@ static int pcm_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag, | |||
| 2361 | unsigned int __user *dst; | 2361 | unsigned int __user *dst; |
| 2362 | int c, count = 0; | 2362 | int c, count = 0; |
| 2363 | 2363 | ||
| 2364 | if (snd_BUG_ON(!info->chmap)) | 2364 | if (!info->chmap) |
| 2365 | return -EINVAL; | 2365 | return -EINVAL; |
| 2366 | if (size < 8) | 2366 | if (size < 8) |
| 2367 | return -ENOMEM; | 2367 | return -ENOMEM; |