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 <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 2c662ed91b5b1bf4e173be767e7f36efcca83d15..d9a934b99a89a6b0e884307e46b7b87bbf2502ef 100644 (file)
--- 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 0ed254b496a50b4b9057f303ebae116bb661552d..02c696a22be005fb4df1eeb4c052b735c9bb3aa5 100644 (file)
--- 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
 };