summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJason Chen <b02280@freescale.com>2011-08-02 15:43:18 +0800
committerJason Chen <b02280@freescale.com>2011-08-04 13:59:13 +0800
commit6ea8a3dea3c7eab4fc95e14a5ad8a896a64001b1 (patch)
tree5517e0c844ec123ffd8794e8f1f826c4dccbd65c /drivers
parent1a13222e336b9a2d1bcdc36fd64bdb1a6367ea39 (diff)
ENGR00154135 sii902x hdmi: should not init twice
sii902x hdmi can only support one display, so second time init function should return -EBUSY. Signed-off-by: Jason Chen <b02280@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mxc/mxcfb_sii902x.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/mxc/mxcfb_sii902x.c b/drivers/video/mxc/mxcfb_sii902x.c
index 42d967f053b8..02f798bbf175 100644
--- a/drivers/video/mxc/mxcfb_sii902x.c
+++ b/drivers/video/mxc/mxcfb_sii902x.c
@@ -1067,6 +1067,12 @@ static int sii902x_disp_init(struct mxc_dispdrv_entry *disp)
struct mxc_dispdrv_setting *setting = mxc_dispdrv_getsetting(disp);
struct fsl_mxc_lcd_platform_data *plat = sii902x->client->dev.platform_data;
bool found = false;
+ static bool inited;
+
+ if (inited)
+ return -EBUSY;
+
+ inited = true;
setting->dev_id = plat->ipu_id;
setting->disp_id = plat->disp_id;
@@ -1139,7 +1145,7 @@ static int sii902x_disp_init(struct mxc_dispdrv_entry *disp)
mode = fb_find_nearest_mode(&m,
&sii902x->fbi->modelist);
fb_videomode_to_var(&sii902x->fbi->var, mode);
- found = 1;
+ found = true;
}
}