* [PATCH] ASoC: simple-card: fix the cinfo error check
@ 2014-01-09 9:49 Xiubo Li
2014-01-09 17:38 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Xiubo Li @ 2014-01-09 9:49 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, linux-kernel, Xiubo Li
If the dt is used and the cinfo is NULL, the -ENOMEM should be return.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/generic/simple-card.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 51a4784..406e4ea 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -223,15 +223,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
dev_err(dev, "parse error %d\n", ret);
return ret;
}
+ } else {
+ return -ENOMEM;
}
} else {
cinfo = pdev->dev.platform_data;
- cinfo->snd_card.dev = &pdev->dev;
- }
+ if (!cinfo) {
+ dev_err(dev, "no info for asoc-simple-card\n");
+ return -EINVAL;
+ }
- if (!cinfo) {
- dev_err(dev, "no info for asoc-simple-card\n");
- return -EINVAL;
+ cinfo->snd_card.dev = &pdev->dev;
}
if (!cinfo->name ||
--
1.8.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: simple-card: fix the cinfo error check
2014-01-09 9:49 [PATCH] ASoC: simple-card: fix the cinfo error check Xiubo Li
@ 2014-01-09 17:38 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2014-01-09 17:38 UTC (permalink / raw)
To: Xiubo Li; +Cc: alsa-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
On Thu, Jan 09, 2014 at 05:49:40PM +0800, Xiubo Li wrote:
> If the dt is used and the cinfo is NULL, the -ENOMEM should be return.
>
> Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-09 17:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-09 9:49 [PATCH] ASoC: simple-card: fix the cinfo error check Xiubo Li
2014-01-09 17: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
all inboxes | Powered by JetHome®