]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ALSA: sparc/cs4231: Use WARN_ON() instead of BUG_ON()
authorTakashi Iwai <tiwai@suse.de>
Tue, 5 Nov 2013 14:02:42 +0000 (15:02 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 6 Nov 2013 07:35:07 +0000 (08:35 +0100)
BUG_ON() is rather useless for debugging as it leads to panic().
Use WARN_ON() and handle the error cases accordingly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/sparc/cs4231.c

index 54aaad2a10f53aa87a42fb01a1e74491ec01b9b2..b47f6fe6277fd72aadfeadda3eddb623a3215291 100644 (file)
@@ -429,7 +429,8 @@ static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont,
                unsigned int period_size = snd_pcm_lib_period_bytes(substream);
                unsigned int offset = period_size * (*periods_sent);
 
-               BUG_ON(period_size >= (1 << 24));
+               if (WARN_ON(period_size >= (1 << 24)))
+                       return;
 
                if (dma_cont->request(dma_cont,
                                      runtime->dma_addr + offset, period_size))
@@ -912,7 +913,8 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream)
        chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE |
                                            CS4231_PLAYBACK_PIO);
 
-       BUG_ON(runtime->period_size > 0xffff + 1);
+       if (WARN_ON(runtime->period_size > 0xffff + 1))
+               return -EINVAL;
 
        chip->p_periods_sent = 0;
        spin_unlock_irqrestore(&chip->lock, flags);