diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-03 10:10:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-03 10:10:23 +1000 |
| commit | 7e17fc0b69fbec2c25398adfb18a18fa6b210a53 (patch) | |
| tree | 3fab05a131aff7aa4e69923af0d390e17aefc0d3 /drivers/video/omap2/displays/panel-tfp410.c | |
| parent | 6110948846e9440a60e491a9be67a8a13c646b7e (diff) | |
| parent | bca3913034ef99c9cc028d054273a3b271ed62b9 (diff) | |
| download | op-kernel-dev-7e17fc0b69fbec2c25398adfb18a18fa6b210a53.zip op-kernel-dev-7e17fc0b69fbec2c25398adfb18a18fa6b210a53.tar.gz | |
Merge tag 'omapdss-for-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into drm-next
OMAPDSS fixes for 3.10:
* Compilation fix when DSI is disabled in Kconfig
* Basic deferred probe support to fix DT boot
* tag 'omapdss-for-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux:
OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
OMAPDSS: VENC: Add error handling for venc_probe_pdata
OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
OMAPDSS: DSI: Add error handling for dsi_probe_pdata
OMAPDSS: SDI: Add error handling for sdi_probe_pdata
OMAPDSS: DPI: Add error handling for dpi_probe_pdata
OMAPDSS: VENC: use platform_driver_register()
OMAPDSS: HDMI: use platform_driver_register()
OMAPDSS: RFBI: use platform_driver_register()
OMAPDSS: DSI: use platform_driver_register()
OMAPDSS: SDI: use platform_driver_register()
OMAPDSS: DPI: use platform_driver_register()
OMAPFB: defer probe if no displays
OMAPFB: use module_platform_driver()
OMAPDSS: Makefile: move omapfb after panels
OMAPDSS: DPI: fix compilation if DSI not compiled in
Diffstat (limited to 'drivers/video/omap2/displays/panel-tfp410.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-tfp410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/panel-tfp410.c b/drivers/video/omap2/displays/panel-tfp410.c index a1dba868..46039c4 100644 --- a/drivers/video/omap2/displays/panel-tfp410.c +++ b/drivers/video/omap2/displays/panel-tfp410.c @@ -135,7 +135,7 @@ static int tfp410_probe(struct omap_dss_device *dssdev) if (!adapter) { dev_err(&dssdev->dev, "Failed to get I2C adapter, bus %d\n", i2c_bus_num); - return -EINVAL; + return -EPROBE_DEFER; } ddata->i2c_adapter = adapter; |
