diff options
| author | Pedro Perez de Heredia <pedro.perez@digi.com> | 2012-02-01 12:42:32 +0100 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-02-01 13:57:45 +0100 |
| commit | 7fba7b287bb80cbb0803c3189fba47d16b3d7a6e (patch) | |
| tree | 943ba98714d85e8861ab98f220a2a5d16e26aaef | |
| parent | 6d0c437cfc762408dca7ce846bccbd8908553d6c (diff) | |
ccxmx53: limit to 1 the number of video IF registered (#41925)
This commit limits to 1 the number of framebuffer devices that
can be registered (+ the overlay). This avoids problems where
2 big displays where connected (fullhd + vga@1280x1024, for
instance).
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
(cherry picked from commit a697c49edfd6ad9e629834bbc87cfae3a9c9781f)
| -rw-r--r-- | arch/arm/mach-mx5/devices_ccwmx53.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/devices_ccwmx53.c b/arch/arm/mach-mx5/devices_ccwmx53.c index e764164db3f0..0c7089e57d04 100644 --- a/arch/arm/mach-mx5/devices_ccwmx53.c +++ b/arch/arm/mach-mx5/devices_ccwmx53.c @@ -715,7 +715,8 @@ struct i2c_board_info ccwmx53_hdmi[] __initdata = { }; #endif -#define MAX_VIDEO_IF 2 +#define MAX_VIDEO_IF 2 +#define MAX_REGISTERED_VIDEO_IF 1 int __init ccwmx5x_init_fb(void) { struct ccwmx5x_lcd_pdata *panel; @@ -725,7 +726,7 @@ int __init ccwmx5x_init_fb(void) plcd_platform_data[0].vif = -1; plcd_platform_data[1].vif = -1; - for (i = 0, regfbdev = 0; i < MAX_VIDEO_IF; i++) { + for (i = 0, regfbdev = 0; i < MAX_VIDEO_IF && regfbdev < MAX_REGISTERED_VIDEO_IF; i++) { #if !defined(CONFIG_CCXMX5X_DISP0) if (i == 0) continue; #endif |