OSDN Git Service

media: tegra_cec: use new cec_notifier_parse_hdmi_phandle helper
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Wed, 10 Apr 2019 09:13:32 +0000 (05:13 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 22 Apr 2019 17:13:27 +0000 (13:13 -0400)
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>
drivers/media/platform/tegra-cec/tegra_cec.c

index aba488c..7fb3a4f 100644 (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;