linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2013-12-19T02:09:32Z

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/staging/imx-drm/imx-drm-core.c between commit 8007875f0619
("imx-drm: imx-drm-core: fix DRM cleanup paths") from Linus' tree and
commit 9076dccfc532 ("drm/imx: directly call drm_put_dev in ->remove")
from the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/imx-drm/imx-drm-core.c
index 96e4eee344ef,0507b662ae40..000000000000
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@@ -443,19 -441,14 +443,21 @@@ static int imx_drm_driver_load(struct d
*/
imxdrm->drm->vblank_disable_allowed = true;

- if (!imx_drm_device_get())
+ if (!imx_drm_device_get()) {
ret = -EINVAL;
+ goto err_vblank;
+ }

+ platform_set_drvdata(drm->platformdev, drm);
+
- ret = 0;
+ mutex_unlock(&imxdrm->mutex);
+ return 0;

-err_init:
+err_vblank:
+ drm_vblank_cleanup(drm);
+err_kms:
+ drm_kms_helper_poll_fini(drm);
+ drm_mode_config_cleanup(drm);
mutex_unlock(&imxdrm->mutex);

return ret;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]