ASoC: checking kzalloc() for IS_ERR() instead of NULL
authorDan Carpenter <error27@gmail.com>
Sat, 9 Oct 2010 19:31:31 +0000 (21:31 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Oct 2010 11:38:21 +0000 (12:38 +0100)
There is a typo here that got copy and pasted to several probe
functions.  kzalloc() returns NULL on allocation failures and not an
ERR_PTR.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8804.c
sound/soc/codecs/wm8985.c

index 642b07ceddfaaf10b44e74280547f9a3b3e448af..4599e8e95aa2297a1c24d9bbd726cfb6a423f57a 100644 (file)
@@ -720,8 +720,8 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi)
        int ret;
 
        wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);
-       if (IS_ERR(wm8804))
-               return PTR_ERR(wm8804);
+       if (!wm8804)
+               return -ENOMEM;
 
        wm8804->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8804);
@@ -758,8 +758,8 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,
        int ret;
 
        wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);
-       if (IS_ERR(wm8804))
-               return PTR_ERR(wm8804);
+       if (!wm8804)
+               return -ENOMEM;
 
        wm8804->control_type = SND_SOC_I2C;
        i2c_set_clientdata(i2c, wm8804);
index ae9020a2a195c69f34fb0834c5919402ef0ddf52..fd2e7cca1228050e360fe750fcad1f86c7b2a906 100644 (file)
@@ -1079,8 +1079,8 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
        int ret;
 
        wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);
-       if (IS_ERR(wm8985))
-               return PTR_ERR(wm8985);
+       if (!wm8985)
+               return -ENOMEM;
 
        wm8985->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8985);
@@ -1117,8 +1117,8 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
        int ret;
 
        wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);
-       if (IS_ERR(wm8985))
-               return PTR_ERR(wm8985);
+       if (!wm8985)
+               return -ENOMEM;
 
        wm8985->control_type = SND_SOC_I2C;
        i2c_set_clientdata(i2c, wm8985);