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

Commit 3a0e27d8 authored by Arnaud Pouliquen's avatar Arnaud Pouliquen Committed by Mark Brown
Browse files

ASoC: sti: check return of of_property_read 



Add check on of_property_read to return error when
DT required property is not defined.

Signed-off-by: default avatarArnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 91931320

sound/soc/sti/uniperif_player.c

+10 −4
Original line number Diff line number Diff line
@@ -989,8 +989,8 @@ static int uni_player_parse_dt(struct platform_device *pdev, 
	if (!info)

		return -ENOMEM;



	of_property_read_u32(pnode, "version", &player->ver);

	if (player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {

	if (of_property_read_u32(pnode, "version", &player->ver) ||

	    player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {

		dev_err(dev, "Unknown uniperipheral version ");

		return -EINVAL;

	}
@@ -998,10 +998,16 @@ static int uni_player_parse_dt(struct platform_device *pdev, 
	if (player->ver >= SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)

		info->underflow_enabled = 1;



	of_property_read_u32(pnode, "uniperiph-id", &info->id);

	if (of_property_read_u32(pnode, "uniperiph-id", &info->id)) {

		dev_err(dev, "uniperipheral id not defined");

		return -EINVAL;

	}



	/* Read the device mode property */

	of_property_read_string(pnode, "mode", &mode);

	if (of_property_read_string(pnode, "mode", &mode)) {

		dev_err(dev, "uniperipheral mode not defined");

		return -EINVAL;

	}



	if (strcasecmp(mode, "hdmi") == 0)

		info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_HDMI;

sound/soc/sti/uniperif_reader.c

+5 −1
Original line number Diff line number Diff line
@@ -316,7 +316,11 @@ static int uni_reader_parse_dt(struct platform_device *pdev, 
	if (!info)

		return -ENOMEM;



	of_property_read_u32(node, "version", &reader->ver);

	if (of_property_read_u32(node, "version", &reader->ver) ||

	    reader->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {

		dev_err(&pdev->dev, "Unknown uniperipheral version ");

		return -EINVAL;

	}



	/* Save the info structure */

	reader->info = info;