From df21c1108a73fdbd5e7aad00214b57b27a673c5d Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 22 Apr 2013 17:13:13 +0900 Subject: [PATCH] --- yaml --- r: 371617 b: refs/heads/master c: 1055f49e9953e5a55e8b7d54db19c4b8c1108eec h: refs/heads/master i: 371615: 87644be3bfc79a4918f69eb79e44541d2d043de2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a4f6244d8c6b..5409af9004e3 100644 --- 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 index 3da5c2d214d8..488278ccb2a8 100644 --- 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 index 5285509e4b34..6986a1b92885 100644 --- 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;