OMAPDSS: connector-dvi: fix releasing i2c_adapter
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 18 Oct 2013 07:46:33 +0000 (10:46 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 29 Oct 2013 11:36:17 +0000 (13:36 +0200)
i2c adapter is not released correctly on error paths. Fix this.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/displays-new/connector-dvi.c

index bc5f8ceda371b1b26308db7c644c6913445c8b18..5641a23b78d129def923df31ab77dbcb8038ac4f 100644 (file)
@@ -262,6 +262,9 @@ static int dvic_probe_pdata(struct platform_device *pdev)
 
        in = omap_dss_find_output(pdata->source);
        if (in == NULL) {
+               if (ddata->i2c_adapter)
+                       i2c_put_adapter(ddata->i2c_adapter);
+
                dev_err(&pdev->dev, "Failed to find video source\n");
                return -ENODEV;
        }
@@ -313,6 +316,10 @@ static int dvic_probe(struct platform_device *pdev)
 
 err_reg:
        omap_dss_put_device(ddata->in);
+
+       if (ddata->i2c_adapter)
+               i2c_put_adapter(ddata->i2c_adapter);
+
        return r;
 }