Changeset 399 for GPL/branches/uniaud32-2.0/alsa-kernel/pci/sonicvibes.c

Timestamp:

Oct 30, 2008, 9:57:08 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.18

File:

• GPL/branches/uniaud32-2.0/alsa-kernel/pci/sonicvibes.c (modified) (3 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/sonicvibes.c

@@ -535 +535 @@
                 } else {
                         snd_sonicvibes_pll(rate, &r, &m, &n);
-                        snd_assert((SV_REFFREQUENCY % 16) == 0, return -EINVAL);
-                        snd_assert((SV_ADCMULT % 512) == 0, return -EINVAL);
+                        snd_BUG_ON(SV_REFFREQUENCY % 16);
+                        snd_BUG_ON(SV_ADCMULT % 512);
                         params->rate_num = (SV_REFFREQUENCY/16) * (n+2) * r;
                         params->rate_den = (SV_ADCMULT/512) * (m+2);
@@ -850 +850 @@
         if ((err = snd_pcm_new(sonic->card, "s3_86c617", device, 1, 1, &pcm)) < 0)
                 return err;
-        snd_assert(pcm != NULL, return -EINVAL);
+        if (snd_BUG_ON(!pcm))
+                return -EINVAL;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sonicvibes_playback_ops);
@@ -1090 +1091 @@
         int err;
 
-        snd_assert(sonic != NULL && sonic->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!sonic || !sonic->card))
+                return -EINVAL;
         card = sonic->card;
         strcpy(card->mixername, "S3 SonicVibes");