Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: simple-card: fix one bug to writing to the platform data

Browse source 
It's a bug that writing to the platform data directly, for it should
be constant. So just copy it before writing.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Xiubo Li 2014-01-14 12:35:32 +08:00 committed by Mark Brown
parent ba194a4de5
commit ca919fe4b9
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
sound/soc/generic/simple-card.c
View file

@ -9,9 +9,10 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/module.h> #include <linux/string.h>
#include <sound/simple_card.h> #include <sound/simple_card.h>
static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
@ -190,36 +191,37 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *of_cpu, *of_codec, *of_platform; struct device_node *of_cpu, *of_codec, *of_platform;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret;
cinfo = NULL; cinfo = NULL;
of_cpu = NULL; of_cpu = NULL;
of_codec = NULL; of_codec = NULL;
of_platform = NULL; of_platform = NULL;
cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL);
if (!cinfo)
return -ENOMEM;
if (np && of_device_is_available(np)) { if (np && of_device_is_available(np)) {
cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL); cinfo->snd_card.dev = dev;
if (cinfo) {
int ret; ret = asoc_simple_card_parse_of(np, cinfo, dev,
cinfo->snd_card.dev = &pdev->dev; &of_cpu,
ret = asoc_simple_card_parse_of(np, cinfo, dev, &of_codec,
&of_cpu, &of_platform);
&of_codec, if (ret < 0) {
&of_platform); if (ret != -EPROBE_DEFER)
if (ret < 0) { dev_err(dev, "parse error %d\n", ret);
if (ret != -EPROBE_DEFER) return ret;
dev_err(dev, "parse error %d\n", ret);
return ret;
}
} else {
return -ENOMEM;
} }
} else { } else {
cinfo = pdev->dev.platform_data; if (!dev->platform_data) {
if (!cinfo) {
dev_err(dev, "no info for asoc-simple-card\n"); dev_err(dev, "no info for asoc-simple-card\n");
return -EINVAL; return -EINVAL;
} }
cinfo->snd_card.dev = &pdev->dev; memcpy(cinfo, dev->platform_data, sizeof(*cinfo));
cinfo->snd_card.dev = dev;
} }
if (!cinfo->name || if (!cinfo->name ||