Changeset 399 for GPL/branches/uniaud32-2.0/alsa-kernel/drivers/opl3

Timestamp:

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

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.18

Location:

GPL/branches/uniaud32-2.0/alsa-kernel/drivers/opl3

Files:

• opl3_lib.c (modified) (2 diffs)
• opl3_midi.c (modified) (2 diffs)
• opl3_synth.c (modified) (1 diff)

GPL/branches/uniaud32-2.0/alsa-kernel/drivers/opl3/opl3_lib.c

@@ -140 +140 @@
                  * by the OPL4 driver; so we can assume OPL3 here.
                  */
-                snd_assert(opl3->r_port != 0, return -ENODEV);
+                if (snd_BUG_ON(!opl3->r_port))
+                        return -ENODEV;
                 opl3->hardware = OPL3_HW_OPL3;
         }
@@ -325 +326 @@
 static int snd_opl3_free(struct snd_opl3 *opl3)
 {
-        snd_assert(opl3 != NULL, return -ENXIO);
+        if (snd_BUG_ON(!opl3))
+                return -ENXIO;
         if (opl3->private_free)
                 opl3->private_free(opl3);

GPL/branches/uniaud32-2.0/alsa-kernel/drivers/opl3/opl3_midi.c

@@ -618 +618 @@
         struct snd_opl3_voice *vp, *vp2;
 
-        snd_assert(voice < MAX_OPL3_VOICES, return);
+        if (snd_BUG_ON(voice >= MAX_OPL3_VOICES))
+                return;
 
         vp = &opl3->voices[voice];
@@ -738 +739 @@
         struct snd_opl3_voice *vp;
 
-        snd_assert(voice < MAX_OPL3_VOICES, return);
+        if (snd_BUG_ON(voice >= MAX_OPL3_VOICES))
+                return;
 
         vp = &opl3->voices[voice];

GPL/branches/uniaud32-2.0/alsa-kernel/drivers/opl3/opl3_synth.c

@@ -93 +93 @@
         void __user *argp = (void __user *)arg;
 
-        snd_assert(opl3 != NULL, return -EINVAL);
+        if (snd_BUG_ON(!opl3))
+                return -EINVAL;
 
         switch (cmd) {