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

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / wl1273.c

diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 34f64dc281ec6438a804a7adf558b610d0dd7d70..f3d4e88d0b7b3b1fc3f3224c7e50f97edb580ade 100644 (file)
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -462,10 +462,8 @@ static int wl1273_probe(struct snd_soc_codec *codec)
        }
 
        wl1273 = kzalloc(sizeof(struct wl1273_priv), GFP_KERNEL);
-       if (wl1273 == NULL) {
-               dev_err(codec->dev, "Cannot allocate memory.\n");
+       if (!wl1273)
                return -ENOMEM;
-       }
 
        wl1273->mode = WL1273_MODE_BT;
        wl1273->core = *core;