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

Commit 34787d0a authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: simple-card: fix the cinfo error check 



If the dt is used and the cinfo is NULL, the -ENOMEM should be return.

Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 708ec024

sound/soc/generic/simple-card.c

+7 −5
Original line number Diff line number Diff line
@@ -211,17 +211,19 @@ 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;

		}



		cinfo->snd_card.dev = &pdev->dev;

	}



	if (!cinfo->name	||

	    !cinfo->card	||

	    !cinfo->codec_dai.name	||