2009-06-21 18:35:27

by Mariusz Kozlowski

Subject: [PATCH] sound: fix check for return value in snd_pcm_hw_refine

Hello,

'params' is a pointer and looking at the code this probably should be a check
for ioctl return value.

Mariusz


Signed-off-by: Mariusz Kozlowski <[email protected]>

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 84da3ba..ac2150e 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -320,7 +320,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) {
changed = substream->ops->ioctl(substream,
SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
- if (params < 0)
+ if (changed < 0)
return changed;
}
}

2009-06-22 05:56:42

by Takashi Iwai

Subject: Re: [PATCH] sound: fix check for return value in snd_pcm_hw_refine

At Sun, 21 Jun 2009 20:26:59 +0200,
Mariusz Kozlowski wrote:
>
> Hello,
>
> 'params' is a pointer and looking at the code this probably should be a check
> for ioctl return value.
>
> Mariusz
>
>
> Signed-off-by: Mariusz Kozlowski <[email protected]>

Applied now. Thanks!


Takashi

>
> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> index 84da3ba..ac2150e 100644
> --- a/sound/core/pcm_native.c
> +++ b/sound/core/pcm_native.c
> @@ -320,7 +320,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
> snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) {
> changed = substream->ops->ioctl(substream,
> SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
> - if (params < 0)
> + if (changed < 0)
> return changed;
> }
> }
>