[PATCH/RFC] v4l: subdev: subdev_fh->pad depends on CONFIG_VIDEO_V4L2_SUBDEV_API

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If CONFIG_VIDEO_V4L2_SUBDEV_API=n:

    drivers/media/v4l2-core/v4l2-subdev.c: In function 'subdev_open':
    drivers/media/v4l2-core/v4l2-subdev.c:86:106: error: 'struct v4l2_subdev_fh' has no member named 'pad'

v4l2_subdev_fh.pad exists only if CONFIG_VIDEO_V4L2_SUBDEV_API is
enabled.

Protect the call to v4l2_subdev_call() by an #ifdef to fix this.

Fixes: e1879dda1574a349 ("v4l: subdev: Call pad init_cfg operation when opening subdevs")
Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
---
Against git://linuxtv.org/pinchartl/fbdev.git vsp1-kms-request-20160306

 drivers/media/v4l2-core/v4l2-subdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 68f3b4fb75cbf569..3fdd6c5f6aca1db7 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -83,7 +83,9 @@ static int subdev_open(struct file *file)
 	}
 #endif
 
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
 	v4l2_subdev_call(sd, pad, init_cfg, subdev_fh->pad);
+#endif
 
 	if (sd->internal_ops && sd->internal_ops->open) {
 		ret = sd->internal_ops->open(sd, subdev_fh);
-- 
1.9.1




[Index of Archives]     [Linux Samsung SOC]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]

  Powered by Linux