diff options
| author | Hans Verkuil | 2019-04-10 11:13:32 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2019-04-22 19:13:27 +0200 |
| commit | 4d34c9267db7af6c23c29adb73a58882a250c2e0 (patch) | |
| tree | 9417bd18d1cddba4035f24a577ecf4c980ecd041 /drivers/media/platform | |
| parent | media: stih_cec: use new cec_notifier_parse_hdmi_phandle helper (diff) | |
| download | kernel-qcow2-linux-4d34c9267db7af6c23c29adb73a58882a250c2e0.tar.gz kernel-qcow2-linux-4d34c9267db7af6c23c29adb73a58882a250c2e0.tar.xz kernel-qcow2-linux-4d34c9267db7af6c23c29adb73a58882a250c2e0.zip | |
media: tegra_cec: use new cec_notifier_parse_hdmi_phandle helper
The Tegra CEC driver increased the HDMI device refcount when
it shouldn't. Use the new helper function to ensure that that
doesn't happen and to simplify the driver code.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/tegra-cec/tegra_cec.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/media/platform/tegra-cec/tegra_cec.c b/drivers/media/platform/tegra-cec/tegra_cec.c index aba488cd0e64..7fb3a4fa07c1 100644 --- a/drivers/media/platform/tegra-cec/tegra_cec.c +++ b/drivers/media/platform/tegra-cec/tegra_cec.c @@ -327,21 +327,15 @@ static const struct cec_adap_ops tegra_cec_ops = { static int tegra_cec_probe(struct platform_device *pdev) { - struct platform_device *hdmi_dev; - struct device_node *np; + struct device *hdmi_dev; struct tegra_cec *cec; struct resource *res; int ret = 0; - np = of_parse_phandle(pdev->dev.of_node, "hdmi-phandle", 0); + hdmi_dev = cec_notifier_parse_hdmi_phandle(&pdev->dev); - if (!np) { - dev_err(&pdev->dev, "Failed to find hdmi node in device tree\n"); + if (!hdmi_dev) return -ENODEV; - } - hdmi_dev = of_find_device_by_node(np); - if (hdmi_dev == NULL) - return -EPROBE_DEFER; cec = devm_kzalloc(&pdev->dev, sizeof(struct tegra_cec), GFP_KERNEL); @@ -400,7 +394,7 @@ static int tegra_cec_probe(struct platform_device *pdev) goto clk_error; } - cec->notifier = cec_notifier_get(&hdmi_dev->dev); + cec->notifier = cec_notifier_get(hdmi_dev); if (!cec->notifier) { ret = -ENOMEM; goto clk_error; |