diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-14 11:28:30 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-14 11:28:30 +0400 |
| commit | 555a098af6086256bc64d3806519f37ccae936e0 (patch) | |
| tree | 4f13126483fc1202d23f1ba55045fac41d19118e /drivers/video/omap2/displays-new/connector-dvi.c | |
| parent | d969135aae1434547f41853f0e8eaa622e8b8816 (diff) | |
| parent | f0d55cc1a65852e6647d4f5d707c1c9b5471ce3c (diff) | |
| download | linux-555a098af6086256bc64d3806519f37ccae936e0.tar.xz | |
Merge branch 'linus' into perf/urgent
Merge dependencies to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/video/omap2/displays-new/connector-dvi.c')
| -rw-r--r-- | drivers/video/omap2/displays-new/connector-dvi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/omap2/displays-new/connector-dvi.c b/drivers/video/omap2/displays-new/connector-dvi.c index 63d88ee6dfe4..b6c50904038e 100644 --- a/drivers/video/omap2/displays-new/connector-dvi.c +++ b/drivers/video/omap2/displays-new/connector-dvi.c @@ -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 -EPROBE_DEFER; } @@ -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; } |