[PATCH][V2][next] ASoC: rk817: remove redundant assignment to pointer node, add missing of_node_put

Chris Morgan macromorgan at hotmail.com
Fri Jun 4 18:01:40 CEST 2021


On Thu, Jun 03, 2021 at 12:36:59PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
> 
> The pointer node is being initialized with a value that is never read and
> it is being updated later with a new value.  The initialization is
> redundant and can be removed.
> 
> The function is missing a of_node_put on node, fix this by adding the call
> before returning.
> 
> Addresses-Coverity: ("Unused value")
> Fixes: 0d6a04da9b25 ("ASoC: Add Rockchip rk817 audio CODEC support")
> Signed-off-by: Colin Ian King <colin.king at canonical.com>

Tested-by: Chris Morgan <macromorgan at hotmail.com>

> ---
> V2: Add missing of_node_put call, kudos to Dan Carpenter for spotting this 
>     issue.
> ---
>  sound/soc/codecs/rk817_codec.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c
> index fd3a5ba034a9..a44d3cad1119 100644
> --- a/sound/soc/codecs/rk817_codec.c
> +++ b/sound/soc/codecs/rk817_codec.c
> @@ -456,7 +456,7 @@ static const struct snd_soc_component_driver soc_codec_dev_rk817 = {
>  static void rk817_codec_parse_dt_property(struct device *dev,
>  					 struct rk817_codec_priv *rk817)
>  {
> -	struct device_node *node = dev->parent->of_node;
> +	struct device_node *node;
>  
>  	node = of_get_child_by_name(dev->parent->of_node, "codec");
>  	if (!node) {
> @@ -466,6 +466,8 @@ static void rk817_codec_parse_dt_property(struct device *dev,
>  
>  	rk817->mic_in_differential =
>  			of_property_read_bool(node, "rockchip,mic-in-differential");
> +
> +	of_node_put(node);
>  }

Tested these changes and they appear to work just fine. Thank you.

>  
>  static int rk817_platform_probe(struct platform_device *pdev)
> -- 
> 2.31.1
> 


More information about the Alsa-devel mailing list