diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2019-06-11 08:42:20 -0500 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2019-06-11 08:42:20 -0500 |
| commit | d0232ce07eea759cf685caf2917fbc8cc71ff7c1 (patch) | |
| tree | 44b98fe3c98cdda708e80396ec69349b8777ff94 /drivers/gpu | |
| parent | 9a1d3ac30fa261dc84546225f5b1683b0cb12464 (diff) | |
| parent | 6d1510d86ef67e5fadb8038671e2ec43416daf7f (diff) | |
| download | linux-rt-d0232ce07eea759cf685caf2917fbc8cc71ff7c1.tar.gz | |
Merge tag 'v4.14.116' into v4.14-rt-work
This is the 4.14.116 stable release
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/meson/meson_drv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 5deb44ac6791..0608243c3387 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -277,10 +277,12 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ret = drm_dev_register(drm, 0); if (ret) - goto free_drm; + goto uninstall_irq; return 0; +uninstall_irq: + drm_irq_uninstall(drm); free_drm: drm_dev_unref(drm); @@ -294,10 +296,11 @@ static int meson_drv_bind(struct device *dev) static void meson_drv_unbind(struct device *dev) { - struct drm_device *drm = dev_get_drvdata(dev); - struct meson_drm *priv = drm->dev_private; + struct meson_drm *priv = dev_get_drvdata(dev); + struct drm_device *drm = priv->drm; drm_dev_unregister(drm); + drm_irq_uninstall(drm); drm_kms_helper_poll_fini(drm); drm_fbdev_cma_fini(priv->fbdev); drm_mode_config_cleanup(drm); |