diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-01 16:58:39 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-11 14:54:38 +0300 |
commit | 9d8232a77fd55e00f0c519518c0ac5bbff1e477c (patch) | |
tree | 3d66ccadf59dd122577e2fb2f44f2b27a6c3bf89 /drivers/video/omap2/dss/venc.c | |
parent | 35deca3de6190b6bc03e34ed45de079047f834ab (diff) | |
download | talos-op-linux-9d8232a77fd55e00f0c519518c0ac5bbff1e477c.tar.gz talos-op-linux-9d8232a77fd55e00f0c519518c0ac5bbff1e477c.zip |
OMAPDSS: init omap_dss_devices internally
Now that each output driver creates their own display devices, the
output drivers can also initialize those devices.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
-rw-r--r-- | drivers/video/omap2/dss/venc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index c194dfab6356..005fdaa2cf7d 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -725,7 +725,7 @@ static struct omap_dss_driver venc_driver = { }; /* driver end */ -int venc_init_display(struct omap_dss_device *dssdev) +static int __init venc_init_display(struct omap_dss_device *dssdev) { DSSDBG("init_display\n"); @@ -883,6 +883,12 @@ static int __init omap_venchw_probe(struct platform_device *pdev) if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) continue; + r = venc_init_display(dssdev); + if (r) { + DSSERR("device %s init failed: %d\n", dssdev->name, r); + continue; + } + r = omap_dss_register_device(dssdev, &pdev->dev, i); if (r) DSSERR("device %s register failed: %d\n", |