Re: [PATCH 2/2] ALSA: compress: Reduce the scope for two variables in snd_compr_set_params()
From: Julia Lawall <hidden>
Date: 2016-08-21 20:36:32
Also in:
alsa-devel, lkml
On Sun, 21 Aug 2016, SF Markus Elfring wrote:
quoted hunk ↗ jump to hunk
From: Markus Elfring <redacted> Date: Sun, 21 Aug 2016 21:26:18 +0200 Reduce the scope for the local variables to an if branch. Signed-off-by: Markus Elfring <redacted> --- sound/core/compress_offload.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 583d407..b43aec5 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c@@ -545,14 +545,14 @@ static int snd_compress_check_input(struct snd_compr_params *params) static int snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) { - struct snd_compr_params *params; - int retval; - if (stream->runtime->state = SNDRV_PCM_STATE_OPEN) { /* * we should allow parameter change only when stream has been * opened not in other cases */ + int retval; + struct snd_compr_params *params;
I don't like this at all. Local variables should be at the top of the function, not hiding under 4 lines of comments in the middle of the code. julia
quoted hunk ↗ jump to hunk
+ params = memdup_user((void __user *)arg, sizeof(*params)); if (IS_ERR(params)) return PTR_ERR(params);@@ -578,12 +578,12 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) stream->runtime->state = SNDRV_PCM_STATE_SETUP; else stream->runtime->state = SNDRV_PCM_STATE_PREPARED; +out: + kfree(params); + return retval; } else { return -EPERM; } -out: - kfree(params); - return retval; } static int --2.9.3