From 433a5b9c01644d92a520de544ca0d892f79a684d Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 13 Mar 2013 20:50:02 +0000 Subject: [PATCH] --- yaml --- r: 372146 b: refs/heads/master c: 008ca431822f39a023322b3598d8366faf46cfc1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/mach-nuri.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 19a4c25f551d..78549aba2500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d98642c3eebddac508ed0dcd9ae3951126ef1501 +refs/heads/master: 008ca431822f39a023322b3598d8366faf46cfc1 diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c index 27d4ed8b116e..b0398575fa65 100644 --- a/trunk/arch/arm/mach-exynos/mach-nuri.c +++ b/trunk/arch/arm/mach-exynos/mach-nuri.c @@ -1252,7 +1252,7 @@ static void __init nuri_camera_init(void) } m5mols_board_info.irq = s5p_register_gpio_interrupt(GPIO_CAM_8M_ISP_INT); - if (!IS_ERR_VALUE(m5mols_board_info.irq)) + if (m5mols_board_info.irq >= 0) s3c_gpio_cfgpin(GPIO_CAM_8M_ISP_INT, S3C_GPIO_SFN(0xF)); else pr_err("%s: Failed to configure 8M_ISP_INT GPIO\n", __func__);