diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 08:08:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 08:08:02 +0100 |
| commit | 10c18c44a6494167e7a7ca3a3a61a67972017bdf (patch) | |
| tree | 20c3afe744b0d88783161169ec88e45a53662fe7 /sound/core/oss/pcm_oss.c | |
| parent | 9e49e2447c6385e45c6fddd70d6c0e917e21b669 (diff) | |
| parent | 1b5f3ba415fe4cf8b8b39c8d104ed44cde330658 (diff) | |
| download | talos-op-linux-10c18c44a6494167e7a7ca3a3a61a67972017bdf.tar.gz talos-op-linux-10c18c44a6494167e7a7ca3a3a61a67972017bdf.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/core/oss/pcm_oss.c')
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index b044c0a5a674..02298c9c6020 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -1762,10 +1762,9 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) return -ENOMEM; _snd_pcm_hw_params_any(params); err = snd_pcm_hw_refine(substream, params); - format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT); - kfree(params); if (err < 0) - return err; + goto error; + format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT); for (fmt = 0; fmt < 32; ++fmt) { if (snd_mask_test(format_mask, fmt)) { int f = snd_pcm_oss_format_to(fmt); @@ -1773,7 +1772,10 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) formats |= f; } } - return formats; + + error: + kfree(params); + return err < 0 ? err : formats; } static int snd_pcm_oss_set_format(struct snd_pcm_oss_file *pcm_oss_file, int format) |
