[alsa-devel] [PATCH] ASoC: atmel: test wrong variable
After clk_get() mclk is checked second time instead of pllb check.
Signed-off-by: Vasiliy Kulikov segoon@openwall.com --- Cannot compile this driver, so it is not tested.
sound/soc/atmel/sam9g20_wm8731.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index da9c303..68072a2 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -223,7 +223,7 @@ static int __init at91sam9g20ek_init(void) }
pllb = clk_get(NULL, "pllb"); - if (IS_ERR(mclk)) { + if (IS_ERR(pllb)) { printk(KERN_ERR "ASoC: Failed to get PLLB\n"); ret = PTR_ERR(mclk); goto err_mclk;
On Sun, 21 Nov 2010 20:40:14 +0300 Vasiliy Kulikov segoon@openwall.com wrote:
After clk_get() mclk is checked second time instead of pllb check.
Signed-off-by: Vasiliy Kulikov segoon@openwall.com
Cannot compile this driver, so it is not tested.
sound/soc/atmel/sam9g20_wm8731.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index da9c303..68072a2 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -223,7 +223,7 @@ static int __init at91sam9g20ek_init(void) }
pllb = clk_get(NULL, "pllb");
- if (IS_ERR(mclk)) {
- if (IS_ERR(pllb)) { printk(KERN_ERR "ASoC: Failed to get PLLB\n"); ret = PTR_ERR(mclk);
Update also PTR_ERR as otherwise we don't return any error code (mclk is ok at this point but pllb has an error).
After clk_get() mclk is checked second time instead of pllb check. In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.
Signed-off-by: Vasiliy Kulikov segoon@openwall.com --- sound/soc/atmel/sam9g20_wm8731.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index da9c303..f16e00c 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -223,9 +223,9 @@ static int __init at91sam9g20ek_init(void) }
pllb = clk_get(NULL, "pllb"); - if (IS_ERR(mclk)) { + if (IS_ERR(pllb)) { printk(KERN_ERR "ASoC: Failed to get PLLB\n"); - ret = PTR_ERR(mclk); + ret = PTR_ERR(pllb); goto err_mclk; } ret = clk_set_parent(mclk, pllb);
Vasiliy Kulikov wrote:
After clk_get() mclk is checked second time instead of pllb check. In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.
Signed-off-by: Vasiliy Kulikov segoon@openwall.com
Why am I'm being cc'd on Atmel driver patches? I've done no work on these drivers.
On Mon, 2010-11-22 at 18:59 +0300, Vasiliy Kulikov wrote:
After clk_get() mclk is checked second time instead of pllb check. In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.
Signed-off-by: Vasiliy Kulikov segoon@openwall.com
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
On Mon, Nov 22, 2010 at 06:59:13PM +0300, Vasiliy Kulikov wrote:
After clk_get() mclk is checked second time instead of pllb check. In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.
Signed-off-by: Vasiliy Kulikov segoon@openwall.com
Applied, thanks.
participants (5)
-
Jarkko Nikula -
Liam Girdwood -
Mark Brown -
Timur Tabi -
Vasiliy Kulikov