diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-03-14 14:47:29 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-06-17 13:00:39 +0200 |
| commit | c6ca5b2201289995f70ee19c0eaf4b5f2ae09923 (patch) | |
| tree | acf7cce67a9df7ec5bf959bc9af390afc510aa2d /drivers/video/omap2/dss/hdmi.c | |
| parent | OMAPDSS: add pdata->default_display_name (diff) | |
| download | linux-c6ca5b2201289995f70ee19c0eaf4b5f2ae09923.tar.xz linux-c6ca5b2201289995f70ee19c0eaf4b5f2ae09923.zip | |
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/hdmi.c')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index a109934c0478..fe72746411e1 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1094,15 +1094,19 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) dss_debugfs_create_file("hdmi", hdmi_dump_regs); - r = hdmi_probe_pdata(pdev); - if (r) { - hdmi_panel_exit(); - hdmi_uninit_output(pdev); - pm_runtime_disable(&pdev->dev); - return r; + if (pdev->dev.platform_data) { + r = hdmi_probe_pdata(pdev); + if (r) + goto err_probe; } return 0; + +err_probe: + hdmi_panel_exit(); + hdmi_uninit_output(pdev); + pm_runtime_disable(&pdev->dev); + return r; } static int __exit hdmi_remove_child(struct device *dev, void *data) |