diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-03-14 17:47:29 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-06-17 15:00:39 +0400 |
| commit | c6ca5b2201289995f70ee19c0eaf4b5f2ae09923 (patch) | |
| tree | acf7cce67a9df7ec5bf959bc9af390afc510aa2d /drivers/video/omap2/dss/venc.c | |
| parent | 0a20012605033c8acd8b2c209c422d78880e2896 (diff) | |
| download | linux-c6ca5b2201289995f70ee19c0eaf4b5f2ae09923.tar.xz | |
OMAPDSS: only probe pdata if there's one
omapdss output drivers always read the platform data. This crashes when
there's no platform data when using DT.
Add a check to read the platform data only if it exists.
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 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 74fdb3ee209e..7b2e3ae18bd7 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -866,16 +866,17 @@ static int omap_venchw_probe(struct platform_device *pdev) venc_init_output(pdev); - r = venc_probe_pdata(pdev); - if (r) { - venc_panel_exit(); - venc_uninit_output(pdev); - pm_runtime_disable(&pdev->dev); - return r; + if (pdev->dev.platform_data) { + r = venc_probe_pdata(pdev); + if (r) + goto err_probe; } return 0; +err_probe: + venc_panel_exit(); + venc_uninit_output(pdev); err_panel_init: err_runtime_get: pm_runtime_disable(&pdev->dev); |