UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hans Verkuil 2019-04-10 05:13:32 -04:00 committed by Mauro Carvalho Chehab
parent e3a7c52de9
commit 4d34c9267d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/platform/tegra-cec/tegra_cec.c
View File

@ -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;