Commit fe3e2e7f authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown

ASoC: checking kzalloc() for IS_ERR() instead of NULL

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: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent c969f19f
...@@ -720,8 +720,8 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi) ...@@ -720,8 +720,8 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi)
int ret; int ret;
wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL); wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);
if (IS_ERR(wm8804)) if (!wm8804)
return PTR_ERR(wm8804); return -ENOMEM;
wm8804->control_type = SND_SOC_SPI; wm8804->control_type = SND_SOC_SPI;
spi_set_drvdata(spi, wm8804); spi_set_drvdata(spi, wm8804);
...@@ -758,8 +758,8 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, ...@@ -758,8 +758,8 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,
int ret; int ret;
wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL); wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);
if (IS_ERR(wm8804)) if (!wm8804)
return PTR_ERR(wm8804); return -ENOMEM;
wm8804->control_type = SND_SOC_I2C; wm8804->control_type = SND_SOC_I2C;
i2c_set_clientdata(i2c, wm8804); i2c_set_clientdata(i2c, wm8804);
......
...@@ -1079,8 +1079,8 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi) ...@@ -1079,8 +1079,8 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
int ret; int ret;
wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL); wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);
if (IS_ERR(wm8985)) if (!wm8985)
return PTR_ERR(wm8985); return -ENOMEM;
wm8985->control_type = SND_SOC_SPI; wm8985->control_type = SND_SOC_SPI;
spi_set_drvdata(spi, wm8985); spi_set_drvdata(spi, wm8985);
...@@ -1117,8 +1117,8 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, ...@@ -1117,8 +1117,8 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
int ret; int ret;
wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL); wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);
if (IS_ERR(wm8985)) if (!wm8985)
return PTR_ERR(wm8985); return -ENOMEM;
wm8985->control_type = SND_SOC_I2C; wm8985->control_type = SND_SOC_I2C;
i2c_set_clientdata(i2c, wm8985); i2c_set_clientdata(i2c, wm8985);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment