diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-22 11:03:54 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-22 11:03:54 -0400 |
commit | 12bc738596ffe4e7f566e13856a0d37ba229b539 (patch) | |
tree | bd9ade7c91ed9e6b2e1c6f2f77b149844d5cc28f /sound | |
parent | b61eaa924c320821469caa0cd2bf89e7a1ec8bd0 (diff) | |
parent | 8bd9bca3c1a214350e2f2f1e2fd493ed24c06f7e (diff) |
Merge branch 'topic/pcm-jiffies-check' into for-linus
* topic/pcm-jiffies-check:
sound: fix check for return value in snd_pcm_hw_refine
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 84da3ba17c86..ac2150e0670d 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, | |||
320 | snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) { | 320 | snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) { |
321 | changed = substream->ops->ioctl(substream, | 321 | changed = substream->ops->ioctl(substream, |
322 | SNDRV_PCM_IOCTL1_FIFO_SIZE, params); | 322 | SNDRV_PCM_IOCTL1_FIFO_SIZE, params); |
323 | if (params < 0) | 323 | if (changed < 0) |
324 | return changed; | 324 | return changed; |
325 | } | 325 | } |
326 | } | 326 | } |