summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-fh.h
diff options
context:
space:
mode:
authorSeungchul Kim <sc377.kim@samsung.com>2020-03-26 10:09:46 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-21 13:40:06 +0200
commitd6ef0719fa90da52a555ff6de5f13e6bea601d33 (patch)
treeb99f5e354de5f370996810c72e368208f090e8ef /include/media/v4l2-fh.h
parent003492984ed7fc1f7cfc565b4a5c77cfd8ceea13 (diff)
downloadlinux-d6ef0719fa90da52a555ff6de5f13e6bea601d33.tar.bz2
media: v4l2-fh: define v4l2_fh struct regardless of condition
v4l2_fh struct define differently by CONFIG_V4L2_MEM2MEM_DEV. If some vendors use CONFIG_V4L2_MEM2MEM_DEV by module, it can make the mismatch of v4l2_fh sturct. By the mismatch, the following error occurs. =============================== [ 7.533506] v4l2_mem2mem: disagrees about version of symbol video_devdata [ 7.533594] v4l2_mem2mem: Unknown symbol video_devdata (err -22) [ 7.535319] v4l2_mem2mem: disagrees about version of symbol v4l2_event_pending [ 7.542532] v4l2_mem2mem: Unknown symbol v4l2_event_pending (err -22) =============================== So v4l2_fh struct is modified to does not have dependency for CONFIG_V4L2_MEM2MEM_DEV. Signed-off-by: Seungchul Kim <sc377.kim@samsung.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'include/media/v4l2-fh.h')
-rw-r--r--include/media/v4l2-fh.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h
index 53b4dbb4ae8e..b5b3e00c8e6a 100644
--- a/include/media/v4l2-fh.h
+++ b/include/media/v4l2-fh.h
@@ -53,9 +53,7 @@ struct v4l2_fh {
unsigned int navailable;
u32 sequence;
-#if IS_ENABLED(CONFIG_V4L2_MEM2MEM_DEV)
struct v4l2_m2m_ctx *m2m_ctx;
-#endif
};
/**