Changeset 399 for GPL/branches/uniaud32-2.0/alsa-kernel/pci/cmipci.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/cmipci.c (modified) (3 diffs)

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

@@ -2363 +2363 @@
         struct cmipci_switch_args *args;
         args = (struct cmipci_switch_args *)kcontrol->private_value;
-        snd_assert(args != NULL, return -EINVAL);
+        if (snd_BUG_ON(!args))
+                return -EINVAL;
         return _snd_cmipci_uswitch_get(kcontrol, ucontrol, args);
 }
@@ -2407 +2408 @@
         struct cmipci_switch_args *args;
         args = (struct cmipci_switch_args *)kcontrol->private_value;
-        snd_assert(args != NULL, return -EINVAL);
+        if (snd_BUG_ON(!args))
+                return -EINVAL;
         return _snd_cmipci_uswitch_put(kcontrol, ucontrol, args);
 }
@@ -2679 +2681 @@
         int err;
 
-        snd_assert(cm != NULL && cm->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!cm || !cm->card))
+                return -EINVAL;
 
         card = cm->card;