Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

[uclinux-h8/linux.git] / sound / soc / codecs / sta529.c

diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 7ece89b..9aa1323 100644 (file)
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -380,10 +380,8 @@ static int sta529_i2c_probe(struct i2c_client *i2c,
                return -EINVAL;
 
        sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
-       if (sta529 == NULL) {
-               dev_err(&i2c->dev, "Can not allocate memory\n");
+       if (!sta529)
                return -ENOMEM;
-       }
 
        sta529->regmap = devm_regmap_init_i2c(i2c, &sta529_regmap);
        if (IS_ERR(sta529->regmap)) {