Skip to content

Commit

Permalink
V4L/DVB: gspca_main: Allow use of input device creation code for non …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 5fb2dde commit ac82f59
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions drivers/media/video/gspca/gspca.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down

0 comments on commit ac82f59

Please sign in to comment.