diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-09-28 16:33:37 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-11-21 10:10:00 +0530 |
| commit | 70eb8263d3b82035db241b5f39a218ad22af790e (patch) | |
| tree | 071453be4423571e991e8b342e8c6643f1021a8b | |
| parent | 8213311ef6112585164438727ff56764acab647c (diff) | |
media: s5p-tv: Make MHL probing optional
MHL is optional, hence may not be present in various boards. Probe
for MHL subdev only if information is provided in platform data.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | drivers/media/platform/s5p-tv/hdmi_drv.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c index 560313065e7d..9cc2e0edd118 100644 --- a/drivers/media/platform/s5p-tv/hdmi_drv.c +++ b/drivers/media/platform/s5p-tv/hdmi_drv.c @@ -1172,13 +1172,16 @@ static int __devinit hdmi_probe(struct platform_device *pdev) ret = PTR_ERR(hdmi_dev->phy_sd); goto fail_vdev; } - hdmi_dev->mhl_sd = hdmi_get_subdev(hdmi_dev, - pdata ? pdata->mhl_info : NULL , - pdata ? pdata->mhl_bus : -1, - "mhl"); - if (IS_ERR_OR_NULL(hdmi_dev->mhl_sd)) { - ret = PTR_ERR(hdmi_dev->mhl_sd); - goto fail_vdev; + + if (pdata && pdata->mhl_info) { + hdmi_dev->mhl_sd = hdmi_get_subdev(hdmi_dev, + pdata ? pdata->mhl_info : NULL , + pdata ? pdata->mhl_bus : -1, + "mhl"); + if (IS_ERR_OR_NULL(hdmi_dev->mhl_sd)) { + ret = PTR_ERR(hdmi_dev->mhl_sd); + goto fail_vdev; + } } clk_enable(hdmi_dev->res.hdmi); |