summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-04-10 22:29:22 +0200
committerThierry Reding <treding@nvidia.com>2017-06-15 14:06:49 +0200
commit59e04bc20de4bd1bd5bfa810bf04a4e50a27b9c1 (patch)
tree95169cb4d749ad75fe26dc37b2af4f9dd32604e6 /drivers/gpu/host1x
parentd758619ba6a5d250914b06b2b923a65e48bdd002 (diff)
downloadop-kernel-dev-59e04bc20de4bd1bd5bfa810bf04a4e50a27b9c1.zip
op-kernel-dev-59e04bc20de4bd1bd5bfa810bf04a4e50a27b9c1.tar.gz
gpu: host1x: Fix error handling
If 'devm_reset_control_get' returns an error, then we erroneously return success because error code is taken from 'host->clk' instead of 'host->rst'. Fixes: b386c6b73ac6 ("gpu: host1x: Support module reset") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170410202922.17665-1-christophe.jaillet@wanadoo.fr
Diffstat (limited to 'drivers/gpu/host1x')
-rw-r--r--drivers/gpu/host1x/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index f05ebb1..ac65f52 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -172,7 +172,7 @@ static int host1x_probe(struct platform_device *pdev)
host->rst = devm_reset_control_get(&pdev->dev, "host1x");
if (IS_ERR(host->rst)) {
- err = PTR_ERR(host->clk);
+ err = PTR_ERR(host->rst);
dev_err(&pdev->dev, "failed to get reset: %d\n", err);
return err;
}
OpenPOWER on IntegriCloud