media: stih_cec: use new cec_notifier_parse_hdmi_phandle helper (e3a7c52d) · Commits · 戴 / test

The STI 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> Acked-by:

Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by:

Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

drivers/media/platform/sti/cec/stih-cec.c

+7 −14

Original line number	Diff line number	Diff line
		@@ -301,26 +301,19 @@ static int stih_cec_probe(struct platform_device *pdev)
		struct device *dev = &pdev->dev;
		struct resource *res;
		struct stih_cec *cec;
		struct device_node *np;
		struct platform_device *hdmi_dev;
		struct device *hdmi_dev;
		int ret;

		hdmi_dev = cec_notifier_parse_hdmi_phandle(dev);

		if (IS_ERR(hdmi_dev))
		return PTR_ERR(hdmi_dev);

		cec = devm_kzalloc(dev, sizeof(*cec), GFP_KERNEL);
		if (!cec)
		return -ENOMEM;

		np = of_parse_phandle(pdev->dev.of_node, "hdmi-phandle", 0);

		if (!np) {
		dev_err(&pdev->dev, "Failed to find hdmi node in device tree\n");
		return -ENODEV;
		}

		hdmi_dev = of_find_device_by_node(np);
		if (!hdmi_dev)
		return -EPROBE_DEFER;

		cec->notifier = cec_notifier_get(&hdmi_dev->dev);
		cec->notifier = cec_notifier_get(hdmi_dev);
		if (!cec->notifier)
		return -ENOMEM;

Admin message