Merge branch 'topic/ice1724-pm' into for-linus

[pandora-kernel.git] / sound / pci / ice1712 / ews.c

diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index 013fc4f..6fe35b8 100644 (file)
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -149,7 +149,8 @@ static int snd_ice1712_ews88mt_chip_select(struct snd_ice1712 *ice, int chip_mas
        struct ews_spec *spec = ice->spec;
        unsigned char data, ndata;
 
-       snd_assert(chip_mask >= 0 && chip_mask <= 0x0f, return -EINVAL);
+       if (snd_BUG_ON(chip_mask < 0 || chip_mask > 0x0f))
+               return -EINVAL;
        snd_i2c_lock(ice->i2c);
        if (snd_i2c_readbytes(spec->i2cdevs[EWS_I2C_PCF2], &data, 1) != 1)
                goto __error;
@@ -685,7 +686,8 @@ static int snd_ice1712_ews88mt_input_sense_get(struct snd_kcontrol *kcontrol, st
        int channel = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
        unsigned char data;
 
-       snd_assert(channel >= 0 && channel <= 7, return 0);
+       if (snd_BUG_ON(channel < 0 || channel > 7))
+               return 0;
        snd_i2c_lock(ice->i2c);
        if (snd_i2c_readbytes(spec->i2cdevs[EWS_I2C_PCF1], &data, 1) != 1) {
                snd_i2c_unlock(ice->i2c);
@@ -705,7 +707,8 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st
        int channel = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
        unsigned char data, ndata;
 
-       snd_assert(channel >= 0 && channel <= 7, return 0);
+       if (snd_BUG_ON(channel < 0 || channel > 7))
+               return 0;
        snd_i2c_lock(ice->i2c);
        if (snd_i2c_readbytes(spec->i2cdevs[EWS_I2C_PCF1], &data, 1) != 1) {
                snd_i2c_unlock(ice->i2c);