diff options
author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2016-10-28 11:09:45 +0200 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2016-11-07 12:58:12 +0100 |
commit | 9376cad2073d2c122864754ea5f80025c8507b0b (patch) | |
tree | 9c001e6b3d5eee90198edf04ff927fb43a3013ab | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
download | linux-9376cad2073d2c122864754ea5f80025c8507b0b.tar.gz linux-9376cad2073d2c122864754ea5f80025c8507b0b.tar.bz2 linux-9376cad2073d2c122864754ea5f80025c8507b0b.zip |
drm/tegra: dpaux: Fix error handling
The devm_pinctrl_register() function returns an error pointer or a valid
handle. So checking for NULL here is pointless and can never trigger.
Check the returned value with IS_ERR instead and propagate this value as
done in the other functions which call devm_pinctrl_register().
Fixes: 0751bb5c44fe ("drm/tegra: dpaux: Add pinctrl support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/gpu/drm/tegra/dpaux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index 059f409556d5..2fde44c3a1b3 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -539,9 +539,9 @@ static int tegra_dpaux_probe(struct platform_device *pdev) dpaux->desc.owner = THIS_MODULE; dpaux->pinctrl = devm_pinctrl_register(&pdev->dev, &dpaux->desc, dpaux); - if (!dpaux->pinctrl) { + if (IS_ERR(dpaux->pinctrl)) { dev_err(&pdev->dev, "failed to register pincontrol\n"); - return -ENODEV; + return PTR_ERR(dpaux->pinctrl); } #endif /* enable and clear all interrupts */ |