Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/oom' and 'asoc/topic...

[sfrench/cifs-2.6.git] / sound / soc / codecs / tlv320aic3x.c

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5360772bc1add02e30c6d4b5510ef9c0ab9ea06e..f14b551b729e390196059d26812997213fd6f8b3 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1477,10 +1477,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
        u32 value;
 
        aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
-       if (aic3x == NULL) {
-               dev_err(&i2c->dev, "failed to create private data\n");
+       if (!aic3x)
                return -ENOMEM;
-       }
 
        aic3x->regmap = devm_regmap_init_i2c(i2c, &aic3x_regmap);
        if (IS_ERR(aic3x->regmap)) {
@@ -1498,10 +1496,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
        } else if (np) {
                ai3x_setup = devm_kzalloc(&i2c->dev, sizeof(*ai3x_setup),
                                                                GFP_KERNEL);
-               if (ai3x_setup == NULL) {
-                       dev_err(&i2c->dev, "failed to create private data\n");
+               if (!ai3x_setup)
                        return -ENOMEM;
-               }
 
                ret = of_get_named_gpio(np, "gpio-reset", 0);
                if (ret >= 0)