diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-06-25 07:17:18 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-06-25 07:50:46 +0300 |
| commit | a1cd3486d7b37dbdc76ac0770a22e763c4d4271f (patch) | |
| tree | 0a18035877a81b3909bf7195a53f8296df2dd63e /drivers/gpu/host1x/dev.c | |
| parent | 5107683f24d458afd94f56f7d7e256b1aa5a673d (diff) | |
| parent | fce3a51d9b31312aa12ecb72ffabfc4c7b40bdc6 (diff) | |
| download | linux-a1cd3486d7b37dbdc76ac0770a22e763c4d4271f.tar.xz | |
Merge tag 'drm/tegra/for-5.8-rc3' of git://anongit.freedesktop.org/tegra/linux into drm-fixes
drm/tegra: Fixes for v5.8-rc3
This contains a fairly random assortment of fixes for various minor
issues.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200624165254.2763104-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu/host1x/dev.c')
| -rw-r--r-- | drivers/gpu/host1x/dev.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index d24344e91922..d0ebb70e2fdd 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -468,11 +468,18 @@ static int host1x_probe(struct platform_device *pdev) err = host1x_register(host); if (err < 0) - goto deinit_intr; + goto deinit_debugfs; + + err = devm_of_platform_populate(&pdev->dev); + if (err < 0) + goto unregister; return 0; -deinit_intr: +unregister: + host1x_unregister(host); +deinit_debugfs: + host1x_debug_deinit(host); host1x_intr_deinit(host); deinit_syncpt: host1x_syncpt_deinit(host); |