aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-10-14 23:25:28 -0400
committerMark Brown <broonie@kernel.org>2015-10-16 10:21:35 -0400
commit8a98b4223d0eab88bba5eb215b275da4ff6ed99c (patch)
treeb227401aade597cf54c3e604ac9674acaaf3c7d2 /sound/soc/sh
parent4362495734d155e10174ace9066827780edaed0d (diff)
ASoC: rsnd: Gen1 probe is not error
Probing from Gen1 is not error. This patch fixup it Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/ctu.c6
-rw-r--r--sound/soc/sh/rcar/dvc.c6
-rw-r--r--sound/soc/sh/rcar/mix.c6
3 files changed, 6 insertions, 12 deletions
diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index a3e7c716e1f7..f1541f464f30 100644
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -118,10 +118,8 @@ int rsnd_ctu_probe(struct platform_device *pdev,
118 int i, nr, ret; 118 int i, nr, ret;
119 119
120 /* This driver doesn't support Gen1 at this point */ 120 /* This driver doesn't support Gen1 at this point */
121 if (rsnd_is_gen1(priv)) { 121 if (rsnd_is_gen1(priv))
122 dev_warn(dev, "CTU is not supported on Gen1\n"); 122 return 0;
123 return -EINVAL;
124 }
125 123
126 rsnd_of_parse_ctu(pdev, of_data, priv); 124 rsnd_of_parse_ctu(pdev, of_data, priv);
127 125
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 8d8eee6350c9..e36c0ac3374b 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -333,10 +333,8 @@ int rsnd_dvc_probe(struct platform_device *pdev,
333 int i, nr, ret; 333 int i, nr, ret;
334 334
335 /* This driver doesn't support Gen1 at this point */ 335 /* This driver doesn't support Gen1 at this point */
336 if (rsnd_is_gen1(priv)) { 336 if (rsnd_is_gen1(priv))
337 dev_warn(dev, "CMD is not supported on Gen1\n"); 337 return 0;
338 return -EINVAL;
339 }
340 338
341 rsnd_of_parse_dvc(pdev, of_data, priv); 339 rsnd_of_parse_dvc(pdev, of_data, priv);
342 340
diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index 8544403ffb26..ac2687d9ee55 100644
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -151,10 +151,8 @@ int rsnd_mix_probe(struct platform_device *pdev,
151 int i, nr, ret; 151 int i, nr, ret;
152 152
153 /* This driver doesn't support Gen1 at this point */ 153 /* This driver doesn't support Gen1 at this point */
154 if (rsnd_is_gen1(priv)) { 154 if (rsnd_is_gen1(priv))
155 dev_warn(dev, "MIX is not supported on Gen1\n"); 155 return 0;
156 return -EINVAL;
157 }
158 156
159 rsnd_of_parse_mix(pdev, of_data, priv); 157 rsnd_of_parse_mix(pdev, of_data, priv);
160 158