* [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL
@ 2010-10-09 19:31 Dan Carpenter
2010-10-10 13:36 ` Liam Girdwood
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dan Carpenter @ 2010-10-09 19:31 UTC (permalink / raw)
To: Mark Brown
Cc: Dimitris Papastamos, alsa-devel, Takashi Iwai, kernel-janitors,
Ian Lartey, Liam Girdwood
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>
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 642b07c..4599e8e 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -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);
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index ae9020a..fd2e7cc 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL
2010-10-09 19:31 [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL Dan Carpenter
@ 2010-10-10 13:36 ` Liam Girdwood
2010-10-11 11:16 ` Dimitris Papastamos
2010-10-11 11:38 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2010-10-10 13:36 UTC (permalink / raw)
To: Dan Carpenter
Cc: Dimitris Papastamos, alsa-devel, Takashi Iwai, Mark Brown,
kernel-janitors, Ian Lartey
On Sat, 2010-10-09 at 21:31 +0200, Dan Carpenter wrote:
> 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: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL
2010-10-09 19:31 [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL Dan Carpenter
2010-10-10 13:36 ` Liam Girdwood
@ 2010-10-11 11:16 ` Dimitris Papastamos
2010-10-11 11:38 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Dimitris Papastamos @ 2010-10-11 11:16 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel, Takashi Iwai, Mark Brown, kernel-janitors, Ian Lartey,
Liam Girdwood
On Sat, 2010-10-09 at 21:31 +0200, Dan Carpenter wrote:
> 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>
>
Thanks for noticing this.
Acked-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL
2010-10-09 19:31 [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL Dan Carpenter
2010-10-10 13:36 ` Liam Girdwood
2010-10-11 11:16 ` Dimitris Papastamos
@ 2010-10-11 11:38 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2010-10-11 11:38 UTC (permalink / raw)
To: Dan Carpenter
Cc: Dimitris Papastamos, alsa-devel, Takashi Iwai, kernel-janitors,
Ian Lartey, Liam Girdwood
On Sat, Oct 09, 2010 at 09:31:31PM +0200, Dan Carpenter wrote:
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-11 11:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-09 19:31 [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL Dan Carpenter
2010-10-10 13:36 ` Liam Girdwood
2010-10-11 11:16 ` Dimitris Papastamos
2010-10-11 11:38 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox