Skip to content

Commit

Permalink
ALSA: sparc: fix missing unlock on error in snd_cs4231_playback_prepa…
Browse files Browse the repository at this point in the history
…re()

Add the missing unlock before return from function
snd_cs4231_playback_prepare() in the error handling
case.

Fixes: 5a19b17 ('ALSA: sparc/cs4231: Use WARN_ON() instead of BUG_ON()')
Signed-off-by: Wei Yongjun <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
Wei Yongjun authored and tiwai committed Nov 11, 2013
1 parent 0c52db8 commit a522409
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions sound/sparc/cs4231.c
Original file line number Diff line number Diff line change
Expand Up @@ -907,19 +907,24 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream)
struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
unsigned long flags;
int ret = 0;

spin_lock_irqsave(&chip->lock, flags);

chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE |
CS4231_PLAYBACK_PIO);

if (WARN_ON(runtime->period_size > 0xffff + 1))
return -EINVAL;
if (WARN_ON(runtime->period_size > 0xffff + 1)) {
ret = -EINVAL;
goto out;
}

chip->p_periods_sent = 0;

out:
spin_unlock_irqrestore(&chip->lock, flags);

return 0;
return ret;
}

static int snd_cs4231_capture_hw_params(struct snd_pcm_substream *substream,
Expand Down

0 comments on commit a522409

Please sign in to comment.