diff mbox series

ASoC: tegra: Fix a NULL vs IS_ERR() check

Message ID YMyjOKFsPe9SietU@mwanda
State New
Headers show
Series ASoC: tegra: Fix a NULL vs IS_ERR() check | expand

Commit Message

Dan Carpenter June 18, 2021, 1:44 p.m. UTC
The tegra_machine_parse_phandle() function doesn't return NULL, it returns
error pointers.

Fixes: cc8f70f56039 ("ASoC: tegra: Unify ASoC machine drivers")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 sound/soc/tegra/tegra_asoc_machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dmitry Osipenko June 18, 2021, 2:07 p.m. UTC | #1
18.06.2021 16:44, Dan Carpenter пишет:
> The tegra_machine_parse_phandle() function doesn't return NULL, it returns
> error pointers.
> 
> Fixes: cc8f70f56039 ("ASoC: tegra: Unify ASoC machine drivers")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  sound/soc/tegra/tegra_asoc_machine.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
> index a53aec361a77..735909310a26 100644
> --- a/sound/soc/tegra/tegra_asoc_machine.c
> +++ b/sound/soc/tegra/tegra_asoc_machine.c
> @@ -409,7 +409,7 @@ int tegra_asoc_machine_probe(struct platform_device *pdev)
>  		return PTR_ERR(np_codec);
>  
>  	np_i2s = tegra_machine_parse_phandle(dev, "nvidia,i2s-controller");
> -	if (!np_i2s)
> +	if (IS_ERR(np_i2s))
>  		return PTR_ERR(np_i2s);
>  
>  	card->dai_link->cpus->of_node = np_i2s;
> 

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Mark Brown June 21, 2021, 6:46 p.m. UTC | #2
On Fri, 18 Jun 2021 16:44:24 +0300, Dan Carpenter wrote:
> The tegra_machine_parse_phandle() function doesn't return NULL, it returns
> error pointers.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: tegra: Fix a NULL vs IS_ERR() check
      commit: 3aed3ddf9639a4f915984177ff8a2253f3f8acfe

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index a53aec361a77..735909310a26 100644
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -409,7 +409,7 @@  int tegra_asoc_machine_probe(struct platform_device *pdev)
 		return PTR_ERR(np_codec);
 
 	np_i2s = tegra_machine_parse_phandle(dev, "nvidia,i2s-controller");
-	if (!np_i2s)
+	if (IS_ERR(np_i2s))
 		return PTR_ERR(np_i2s);
 
 	card->dai_link->cpus->of_node = np_i2s;