From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 May 2013 00:14:57 +0000 (+1000)
Subject: Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.10-rc4~13^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=80ce5f6f25bea86f4fbfb9c19c09e43ccac90bfd;p=uclinux-h8%2Flinux.git

Merge branch 'exynos-drm-fixes' of git://git./linux/kernel/git/daeinki/drm-exynos into drm-next

Inki writes:
  This pull request includes drm_send_vblank_event() helper
   relevant patch I missed and code cleanups. And also it fixes
   a pended page flip issue.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: replace request_threaded_irq with devm function
  drm/exynos: remove unnecessary devm_kfree
  drm/exynos: fix build warnings from ipp fimc
  drm/exynos: cleanup device pointer usages
  drm/exynos: wait for the completion of pending page flip
  drm/exynos: use drm_send_vblank_event() helper
  drm/exynos: page flip fixes
  drm/exynos: exynos_hdmi: Pass correct pointer to free_irq()
  drm/exynos: exynos_drm_ipp: Fix incorrect usage of IS_ERR_OR_NULL
  drm/exynos: exynos_drm_fbdev: Fix incorrect usage of IS_ERR_OR_NULL

Conflicts:
	drivers/gpu/drm/exynos/exynos_hdmi.c
---

80ce5f6f25bea86f4fbfb9c19c09e43ccac90bfd
diff --cc drivers/gpu/drm/exynos/exynos_hdmi.c
index 6652597586a1,2f785325d6de..fd1426dca882
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@@ -2005,7 -2005,12 +2005,7 @@@ static int hdmi_probe(struct platform_d
  	}
  
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- 	hdata->regs = devm_ioremap_resource(&pdev->dev, res);
 -	if (!res) {
 -		DRM_ERROR("failed to find registers\n");
 -		return -ENOENT;
 -	}
 -
+ 	hdata->regs = devm_ioremap_resource(dev, res);
  	if (IS_ERR(hdata->regs))
  		return PTR_ERR(hdata->regs);