Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[cascardo/linux.git] / sound / soc / codecs / tpa6130a2.c

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 998555f..b27c396 100644 (file)
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -56,7 +56,8 @@ static int tpa6130a2_i2c_read(int reg)
        struct tpa6130a2_data *data;
        int val;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return -EINVAL;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        /* If powered off, return the cached value */
@@ -78,7 +79,8 @@ static int tpa6130a2_i2c_write(int reg, u8 value)
        struct tpa6130a2_data *data;
        int val = 0;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return -EINVAL;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        if (data->power_state) {
@@ -99,7 +101,8 @@ static u8 tpa6130a2_read(int reg)
 {
        struct tpa6130a2_data *data;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return 0;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        return data->regs[reg];
@@ -110,7 +113,8 @@ static int tpa6130a2_initialize(void)
        struct tpa6130a2_data *data;
        int i, ret = 0;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return -EINVAL;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        for (i = 1; i < TPA6130A2_REG_VERSION; i++) {
@@ -128,7 +132,8 @@ static int tpa6130a2_power(u8 power)
        u8      val;
        int     ret = 0;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return -EINVAL;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        mutex_lock(&data->mutex);
@@ -194,7 +199,8 @@ static int tpa6130a2_get_volsw(struct snd_kcontrol *kcontrol,
        unsigned int mask = (1 << fls(max)) - 1;
        unsigned int invert = mc->invert;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return -EINVAL;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        mutex_lock(&data->mutex);
@@ -224,7 +230,8 @@ static int tpa6130a2_put_volsw(struct snd_kcontrol *kcontrol,
        unsigned int val = (ucontrol->value.integer.value[0] & mask);
        unsigned int val_reg;
 
-       BUG_ON(tpa6130a2_client == NULL);
+       if (WARN_ON(!tpa6130a2_client))
+               return -EINVAL;
        data = i2c_get_clientdata(tpa6130a2_client);
 
        if (invert)