aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-02-19 04:28:39 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:11:09 -0300
commitac82f59f9cc6aae3300430fcc3422e59f83d89ae (patch)
treef1d16866c32178d7a54b76bbf9c733a946876d27
parent5fb2dde28122e74bbab9dae3cc04bcbc8c08b332 (diff)
V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs
Allow use of the gspca core input device creation code by subdrivers which have non interrupt driven camera buttons. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/gspca.c2
-rw-r--r--drivers/media/video/gspca/gspca.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 2c662ed91b5..d9a934b99a8 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -158,7 +158,7 @@ static int gspca_input_connect(struct gspca_dev *dev)
int err = 0;
dev->input_dev = NULL;
- if (dev->sd_desc->int_pkt_scan) {
+ if (dev->sd_desc->int_pkt_scan || dev->sd_desc->other_input) {
input_dev = input_allocate_device();
if (!input_dev)
return -ENOMEM;
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 0ed254b496a..02c696a22be 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -131,6 +131,9 @@ struct sd_desc {
cam_ident_op get_chip_ident;
#ifdef CONFIG_INPUT
cam_int_pkt_op int_pkt_scan;
+ /* other_input makes the gspca core create gspca_dev->input even when
+ int_pkt_scan is NULL, for cams with non interrupt driven buttons */
+ u8 other_input;
#endif
};