Commit 4f6c1104 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: davinci: fix a debug printk

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: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 444faf34
...@@ -1397,9 +1397,9 @@ static int vpif_async_bound(struct v4l2_async_notifier *notifier, ...@@ -1397,9 +1397,9 @@ static int vpif_async_bound(struct v4l2_async_notifier *notifier,
vpif_obj.config->chan_config->inputs[i].subdev_name = vpif_obj.config->chan_config->inputs[i].subdev_name =
(char *)to_of_node(subdev->fwnode)->full_name; (char *)to_of_node(subdev->fwnode)->full_name;
vpif_dbg(2, debug, vpif_dbg(2, debug,
"%s: setting input %d subdev_name = %pOF\n", "%s: setting input %d subdev_name = %s\n",
__func__, i, __func__, i,
to_of_node(subdev->fwnode)); vpif_obj.config->chan_config->inputs[i].subdev_name);
return 0; return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment