Commit 06299bd0 authored Nov 01, 2017 by Mauro Carvalho Chehab Committed by Greg Kroah-Hartman Mar 24, 2018

media: davinci: fix a debug printk




[ Upstream commit 4f6c11044f512356cb63d3df0f3b38db79dc6736 ]

Two orthogonal changesets caused a breakage at a printk
inside davinci. Commit a2d17962
("[media] davinci: Switch from V4L2 OF to V4L2 fwnode")
made davinci to use struct fwnode_handle instead of
struct device_node. Commit 68d9c47b
("media: Convert to using %pOF instead of full_name")
changed the printk to not use ->full_name, but, instead,
to rely on %pOF.

With both patches applied, the Kernel will do the wrong
thing, as warned by smatch:
	drivers/media/platform/davinci/vpif_capture.c:1399 vpif_async_bound() error: '%pOF' expects argument of type 'struct device_node*', argument 5 has type 'void*'

So, change the logic to actually print the device name
that was obtained before the print logic.

Fixes: 68d9c47b ("media: Convert to using %pOF instead of full_name")
Fixes: a2d17962 ("[media] davinci: Switch from V4L2 OF to V4L2 fwnode")

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fea71881

drivers/media/platform/davinci/vpif_capture.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1397,9 +1397,9 @@ static int vpif_async_bound(struct v4l2_async_notifier *notifier,
		vpif_obj.config->chan_config->inputs[i].subdev_name =
		(char *)to_of_node(subdev->fwnode)->full_name;
		vpif_dbg(2, debug,
		"%s: setting input %d subdev_name = %pOF\n",
		"%s: setting input %d subdev_name = %s\n",
		__func__, i,
		to_of_node(subdev->fwnode));
		vpif_obj.config->chan_config->inputs[i].subdev_name);
		return 0;
		}
		}