summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 07:28:06 (GMT)
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-14 10:09:48 (GMT)
commitba02fa37de80bea10d706f39f076dd848348320a (patch)
treea92111444bb7ab0e523b7a5a2e96b44cc87b863f /drivers
parentcce18a947967ed028e5301bce84cbaff395489a6 (diff)
downloadlinux-ba02fa37de80bea10d706f39f076dd848348320a.tar.xz
HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to prevent crash
Something seems to be wrong with OMAP4 & VENC, and register access fails in omap_venchw_probe(). This patch skips venc driver registration on OMAP4, thus circumventing the problem for now. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/venc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 43009e5..8e35a5b 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -769,10 +769,16 @@ static struct platform_driver omap_venchw_driver = {
int venc_init_platform_driver(void)
{
+ if (cpu_is_omap44xx())
+ return 0;
+
return platform_driver_register(&omap_venchw_driver);
}
void venc_uninit_platform_driver(void)
{
+ if (cpu_is_omap44xx())
+ return;
+
return platform_driver_unregister(&omap_venchw_driver);
}