1 files changed, 21 insertions, 12 deletions

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 79393099d505..17f4d55c621c 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -328,7 +328,7 @@ static void hdmi_runtime_put(void)
         WARN_ON(r < 0 && r != -ENOSYS);
 }
 
-static int __init hdmi_init_display(struct omap_dss_device *dssdev)
+static int hdmi_init_display(struct omap_dss_device *dssdev)
 {
         int r;
 
@@ -954,7 +954,7 @@ int hdmi_audio_config(struct omap_dss_audio *audio)
 
 #endif
 
-static struct omap_dss_device * __init hdmi_find_dssdev(struct platform_device *pdev)
+static struct omap_dss_device *hdmi_find_dssdev(struct platform_device *pdev)
 {
         struct omap_dss_board_info *pdata = pdev->dev.platform_data;
         const char *def_disp_name = omapdss_get_default_display_name();
@@ -982,7 +982,7 @@ static struct omap_dss_device * __init hdmi_find_dssdev(struct platform_device *
         return def_dssdev;
 }
 
-static void __init hdmi_probe_pdata(struct platform_device *pdev)
+static int hdmi_probe_pdata(struct platform_device *pdev)
 {
         struct omap_dss_device *plat_dssdev;
         struct omap_dss_device *dssdev;
@@ -992,11 +992,11 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
         plat_dssdev = hdmi_find_dssdev(pdev);
 
         if (!plat_dssdev)
-                return;
+                return 0;
 
         dssdev = dss_alloc_and_init_device(&pdev->dev);
         if (!dssdev)
-                return;
+                return -ENOMEM;
 
         dss_copy_device_pdata(dssdev, plat_dssdev);
 
@@ -1010,7 +1010,7 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
         if (r) {
                 DSSERR("device %s init failed: %d\n", dssdev->name, r);
                 dss_put_device(dssdev);
-                return;
+                return r;
         }
 
         r = omapdss_output_set_device(&hdmi.output, dssdev);
@@ -1018,7 +1018,7 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
                 DSSERR("failed to connect output to new device: %s\n",
                                 dssdev->name);
                 dss_put_device(dssdev);
-                return;
+                return r;
         }
 
         r = dss_add_device(dssdev);
@@ -1027,11 +1027,13 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
                 omapdss_output_unset_device(&hdmi.output);
                 hdmi_uninit_display(dssdev);
                 dss_put_device(dssdev);
-                return;
+                return r;
         }
+
+        return 0;
 }
 
-static void __init hdmi_init_output(struct platform_device *pdev)
+static void hdmi_init_output(struct platform_device *pdev)
 {
         struct omap_dss_output *out = &hdmi.output;
 
@@ -1052,7 +1054,7 @@ static void __exit hdmi_uninit_output(struct platform_device *pdev)
 }
 
 /* HDMI HW IP initialisation */
-static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
+static int omapdss_hdmihw_probe(struct platform_device *pdev)
 {
         struct resource *res;
         int r;
@@ -1096,7 +1098,13 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
 
         dss_debugfs_create_file("hdmi", hdmi_dump_regs);
 
-        hdmi_probe_pdata(pdev);
+        r = hdmi_probe_pdata(pdev);
+        if (r) {
+                hdmi_panel_exit();
+                hdmi_uninit_output(pdev);
+                pm_runtime_disable(&pdev->dev);
+                return r;
+        }
 
         return 0;
 }
@@ -1151,6 +1159,7 @@ static const struct dev_pm_ops hdmi_pm_ops = {
 };
 
 static struct platform_driver omapdss_hdmihw_driver = {
+        .probe          = omapdss_hdmihw_probe,
         .remove         = __exit_p(omapdss_hdmihw_remove),
         .driver         = {
                 .name   = "omapdss_hdmi",
@@ -1161,7 +1170,7 @@ static struct platform_driver omapdss_hdmihw_driver = {
 
 int __init hdmi_init_platform_driver(void)
 {
-        return platform_driver_probe(&omapdss_hdmihw_driver, omapdss_hdmihw_probe);
+        return platform_driver_register(&omapdss_hdmihw_driver);
 }
 
 void __exit hdmi_uninit_platform_driver(void)