From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 24 Dec 2013 18:06:37 +0000 (-0800)
Subject: Merge 3.13-rc5 into staging-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=912cbd495204ee6fcb67b8704ffbda10615d1f2f;p=linux-beck.git

Merge 3.13-rc5 into staging-next

This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

912cbd495204ee6fcb67b8704ffbda10615d1f2f
diff --cc drivers/staging/imx-drm/imx-drm-core.c
index 0507b662ae40,96e4eee344ef..09ef5fb8bae6
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@@ -441,14 -443,19 +443,20 @@@ 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);
+ 	mutex_unlock(&imxdrm->mutex);
+ 	return 0;
  
- 	ret = 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;