Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9469b8b6 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: check the Gen1 at the beginning of DVC probe 



DVC doesn't support Gen1, check it beginning of probe

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarKeita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 98d358af

sound/soc/sh/rcar/dvc.c

+6 −6
Original line number Diff line number Diff line
@@ -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;