Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 32a1db42480dc972e8e92be68d9e604f6aff5381

Authored by Adrian Bunk
Committed by Mauro Carvalho Chehab
1 parent ff01652cf8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

V4L/DVB (5591): Saa7146: proper prototype for saa7146_video_do_ioctl() 

This patch adds a proper prototype for saa7146_video_do_ioctl() in
include/media/saa7146_vv.h.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

drivers/media/common/saa7146_fops.c
Diff comments   View file @ 32a1db4
... ... @@ -307,7 +307,6 @@
307 307 return 0;
308 308 }
309 309  
310   -int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg);
311 310 static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
312 311 {
313 312 /*
include/media/saa7146_vv.h
Diff comments   View file @ 32a1db4
... ... @@ -216,6 +216,8 @@
216 216 extern struct saa7146_use_ops saa7146_video_uops;
217 217 int saa7146_start_preview(struct saa7146_fh *fh);
218 218 int saa7146_stop_preview(struct saa7146_fh *fh);
  219 +int saa7146_video_do_ioctl(struct inode *inode, struct file *file,
  220 + unsigned int cmd, void *arg);
219 221  
220 222 /* from saa7146_vbi.c */
221 223 extern struct saa7146_use_ops saa7146_vbi_uops;