ALSA: ice1712: Fix assignment in if condition

[linux-2.6-microblaze.git] / sound / pci / ice1712 / ews.c

diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index 3794308..8bb86b3 100644 (file)
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -442,7 +442,8 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
        ice->spec = spec;
 
        /* create i2c */
-       if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
+       err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c);
+       if (err < 0) {
                dev_err(ice->card->dev, "unable to create I2C bus\n");
                return err;
        }
@@ -483,7 +484,8 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
                if (err < 0)
                        return err;
                /* Check if the front module is connected */
-               if ((err = snd_ice1712_ews88mt_chip_select(ice, 0x0f)) < 0)
+               err = snd_ice1712_ews88mt_chip_select(ice, 0x0f);
+               if (err < 0)
                        return err;
                break;
        case ICE1712_SUBDEVICE_EWS88D:
@@ -498,12 +500,14 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
        /* set up SPDIF interface */
        switch (ice->eeprom.subvendor) {
        case ICE1712_SUBDEVICE_EWX2496:
-               if ((err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR)) < 0)
+               err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR);
+               if (err < 0)
                        return err;
                snd_cs8427_reg_write(ice->cs8427, CS8427_REG_RECVERRMASK, CS8427_UNLOCK | CS8427_CONF | CS8427_BIP | CS8427_PAR);
                break;
        case ICE1712_SUBDEVICE_DMX6FIRE:
-               if ((err = snd_ice1712_init_cs8427(ice, ICE1712_6FIRE_CS8427_ADDR)) < 0)
+               err = snd_ice1712_init_cs8427(ice, ICE1712_6FIRE_CS8427_ADDR);
+               if (err < 0)
                        return err;
                snd_cs8427_reg_write(ice->cs8427, CS8427_REG_RECVERRMASK, CS8427_UNLOCK | CS8427_CONF | CS8427_BIP | CS8427_PAR);
                break;
@@ -853,7 +857,8 @@ static int snd_ice1712_6fire_control_get(struct snd_kcontrol *kcontrol, struct s
        int invert = (kcontrol->private_value >> 8) & 1;
        int data;
        
-       if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) < 0)
+       data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);
+       if (data < 0)
                return data;
        data = (data >> shift) & 1;
        if (invert)
@@ -869,7 +874,8 @@ static int snd_ice1712_6fire_control_put(struct snd_kcontrol *kcontrol, struct s
        int invert = (kcontrol->private_value >> 8) & 1;
        int data, ndata;
        
-       if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) < 0)
+       data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);
+       if (data < 0)
                return data;
        ndata = data & ~(1 << shift);
        if (ucontrol->value.integer.value[0])
@@ -896,7 +902,8 @@ static int snd_ice1712_6fire_select_input_get(struct snd_kcontrol *kcontrol, str
        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
        int data;
        
-       if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) < 0)
+       data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);
+       if (data < 0)
                return data;
        ucontrol->value.integer.value[0] = data & 3;
        return 0;
@@ -907,7 +914,8 @@ static int snd_ice1712_6fire_select_input_put(struct snd_kcontrol *kcontrol, str
        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
        int data, ndata;
        
-       if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) < 0)
+       data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);
+       if (data < 0)
                return data;
        ndata = data & ~3;
        ndata |= (ucontrol->value.integer.value[0] & 3);