diff options
| author | Sean Paul | 2018-10-24 20:26:04 +0200 |
|---|---|---|
| committer | Sean Paul | 2018-10-24 20:26:04 +0200 |
| commit | 6542e9adc0da1e23d81ff9314265a029b961906d (patch) | |
| tree | 35ba360a7150d8b042a9fd75ab54ef83b34a2b95 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | drm/vc4: Set ->is_yuv to false when num_planes == 1 (diff) | |
| parent | Merge tag 'drm-intel-next-fixes-2018-10-18' of git://anongit.freedesktop.org/... (diff) | |
| download | kernel-qcow2-linux-6542e9adc0da1e23d81ff9314265a029b961906d.tar.gz kernel-qcow2-linux-6542e9adc0da1e23d81ff9314265a029b961906d.tar.xz kernel-qcow2-linux-6542e9adc0da1e23d81ff9314265a029b961906d.zip | |
Merge drm/drm-next into drm-misc-next
4.19 is out, Lyude asked for a backmerge, and it's been a while. All
very good reasons on their own :-)
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 69dbdba183fe..5e758d95751a 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -338,7 +338,7 @@ static int msm_drm_uninit(struct device *dev) mdss->funcs->destroy(ddev); ddev->dev_private = NULL; - drm_dev_unref(ddev); + drm_dev_put(ddev); kfree(priv); @@ -453,7 +453,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) { ret = -ENOMEM; - goto err_unref_drm_dev; + goto err_put_drm_dev; } ddev->dev_private = priv; @@ -654,8 +654,8 @@ err_destroy_mdss: mdss->funcs->destroy(ddev); err_free_priv: kfree(priv); -err_unref_drm_dev: - drm_dev_unref(ddev); +err_put_drm_dev: + drm_dev_put(ddev); return ret; } |