---

yaml --- r: 371617 b: refs/heads/master c: 1055f49 h: refs/heads/master i: 371615: 87644be v: v3
git-mirror · Apr 29, 2013 · df21c11 · df21c11
1 parent 3fa9bb5
commit df21c11
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5186fc5e8eda184935467aa84295b2897166fecd
+refs/heads/master: 1055f49e9953e5a55e8b7d54db19c4b8c1108eec
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -388,7 +388,7 @@ static int __init exynos_drm_init(void)
 
 	exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1,
 				NULL, 0);
-	if (IS_ERR_OR_NULL(exynos_drm_pdev)) {
+	if (IS_ERR(exynos_drm_pdev)) {
 		ret = PTR_ERR(exynos_drm_pdev);
 		goto out;
 	}

diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
@@ -56,7 +56,7 @@ int exynos_platform_device_hdmi_register(void)
 
 	exynos_drm_hdmi_pdev = platform_device_register_simple(
 			"exynos-drm-hdmi", -1, NULL, 0);
-	if (IS_ERR_OR_NULL(exynos_drm_hdmi_pdev))
+	if (IS_ERR(exynos_drm_hdmi_pdev))
 		return PTR_ERR(exynos_drm_hdmi_pdev);
 
 	return 0;