Skip to content

Commit

Permalink
ASoC: rsnd: check the Gen1 at the beginning of DVC probe
Browse files Browse the repository at this point in the history
DVC doesn't support Gen1, check it beginning of probe

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jul 16, 2015
1 parent 98d358a commit 9469b8b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sound/soc/sh/rcar/dvc.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,18 +332,18 @@ int rsnd_dvc_probe(struct platform_device *pdev,
char name[RSND_DVC_NAME_SIZE];
int i, nr, ret;

rsnd_of_parse_dvc(pdev, of_data, priv);

nr = info->dvc_info_nr;
if (!nr)
return 0;

/* This driver doesn't support Gen1 at this point */
if (rsnd_is_gen1(priv)) {
dev_warn(dev, "CMD is not supported on Gen1\n");
return -EINVAL;
}

rsnd_of_parse_dvc(pdev, of_data, priv);

nr = info->dvc_info_nr;
if (!nr)
return 0;

dvc = devm_kzalloc(dev, sizeof(*dvc) * nr, GFP_KERNEL);
if (!dvc)
return -ENOMEM;
Expand Down

0 comments on commit 9469b8b

Please sign in to comment.