ALSA: opti9xx: Fix assignment in if condition

[linux-2.6-microblaze.git] / sound / isa / opti9xx / miro.c

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index a510b20..e1fb756 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -722,35 +722,43 @@ static int snd_miro_mixer(struct snd_card *card,
        }
 
        for (idx = 0; idx < ARRAY_SIZE(snd_miro_controls); idx++) {
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_controls[idx], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_controls[idx], miro));
+               if (err < 0)
                        return err;
        }
 
        if ((miro->aci->aci_product == 'A') ||
            (miro->aci->aci_product == 'B')) {
                /* PCM1/PCM12 with power-amp and Line 2 */
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_line_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_line_control[0], miro));
+               if (err < 0)
                        return err;
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_amp_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_amp_control[0], miro));
+               if (err < 0)
                        return err;
        }
 
        if ((miro->aci->aci_product == 'B') ||
            (miro->aci->aci_product == 'C')) {
                /* PCM12/PCM20 with mic-preamp */
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_preamp_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_preamp_control[0], miro));
+               if (err < 0)
                        return err;
-               if (miro->aci->aci_version >= 176)
-                       if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_capture_control[0], miro))) < 0)
+               if (miro->aci->aci_version >= 176) {
+                       err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_capture_control[0], miro));
+                       if (err < 0)
                                return err;
+               }
        }
 
        if (miro->aci->aci_product == 'C') {
                /* PCM20 with radio and 7 band equalizer */
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_radio_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_radio_control[0], miro));
+               if (err < 0)
                        return err;
                for (idx = 0; idx < ARRAY_SIZE(snd_miro_eq_controls); idx++) {
-                       if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_eq_controls[idx], miro))) < 0)
+                       err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_eq_controls[idx], miro));
+                       if (err < 0)
                                return err;
                }
        }
@@ -1178,7 +1186,8 @@ static int snd_card_miro_detect(struct snd_card *card,
 
        for (i = OPTi9XX_HW_82C929; i <= OPTi9XX_HW_82C924; i++) {
 
-               if ((err = snd_miro_init(chip, i)) < 0)
+               err = snd_miro_init(chip, i);
+               if (err < 0)
                        return err;
 
                err = snd_miro_opti_check(chip);