aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-12-18 11:55:20 -0500
committerKukjin Kim <kgene.kim@samsung.com>2012-12-19 12:25:23 -0500
commit873673d302e48051c5b90c6e27f86400bdd366ba (patch)
treebf0287a66dfbc19815e0fd89a78a1663c98dde48 /arch
parentbdd1853212609ef1b1826ffc8b43439b0c54b2eb (diff)
ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
When DRM support for Samsung SoC and Samsung S3C framebuffer support are selected, the kernel crashes as it does not get the required platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD to fix this. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos/mach-smdkv310.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index b7384241fb03..35548e3c097d 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -159,7 +159,7 @@ static struct platform_device smdkv310_lcd_lte480wv = {
159 .dev.platform_data = &smdkv310_lcd_lte480wv_data, 159 .dev.platform_data = &smdkv310_lcd_lte480wv_data,
160}; 160};
161 161
162#ifdef CONFIG_DRM_EXYNOS 162#ifdef CONFIG_DRM_EXYNOS_FIMD
163static struct exynos_drm_fimd_pdata drm_fimd_pdata = { 163static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
164 .panel = { 164 .panel = {
165 .timing = { 165 .timing = {
@@ -402,7 +402,7 @@ static void __init smdkv310_machine_init(void)
402 samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data); 402 samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
403 pwm_add_table(smdkv310_pwm_lookup, ARRAY_SIZE(smdkv310_pwm_lookup)); 403 pwm_add_table(smdkv310_pwm_lookup, ARRAY_SIZE(smdkv310_pwm_lookup));
404 404
405#ifdef CONFIG_DRM_EXYNOS 405#ifdef CONFIG_DRM_EXYNOS_FIMD
406 s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata; 406 s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;
407 exynos4_fimd0_gpio_setup_24bpp(); 407 exynos4_fimd0_gpio_setup_24bpp();
408#else 408#else