aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/konica.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-10-01 06:33:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:20 -0400
commit2856643e2e18f306227ae1257b63fc713d426dc7 (patch)
tree95d66ed5853da693ec44729f592ee3e2f3dea80a /drivers/media/video/gspca/konica.c
parent85c55efb0a20c5dac435a6817ffb20fe988b9122 (diff)
V4L/DVB: gspca - many subdrivers: Handle the buttons when CONFIG_INPUT=m
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/konica.c')
-rw-r--r--drivers/media/video/gspca/konica.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index 31ea306abcc..f3fe33c2382 100644
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -352,7 +352,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
352 struct sd *sd = (struct sd *) gspca_dev; 352 struct sd *sd = (struct sd *) gspca_dev;
353 353
354 konica_stream_off(gspca_dev); 354 konica_stream_off(gspca_dev);
355#ifdef CONFIG_INPUT 355#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
356 /* Don't keep the button in the pressed state "forever" if it was 356 /* Don't keep the button in the pressed state "forever" if it was
357 pressed when streaming is stopped */ 357 pressed when streaming is stopped */
358 if (sd->snapshot_pressed) { 358 if (sd->snapshot_pressed) {
@@ -451,7 +451,7 @@ static void sd_isoc_irq(struct urb *urb)
451 gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); 451 gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
452 gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0); 452 gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0);
453 } else { 453 } else {
454#ifdef CONFIG_INPUT 454#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
455 u8 button_state = st & 0x40 ? 1 : 0; 455 u8 button_state = st & 0x40 ? 1 : 0;
456 if (sd->snapshot_pressed != button_state) { 456 if (sd->snapshot_pressed != button_state) {
457 input_report_key(gspca_dev->input_dev, 457 input_report_key(gspca_dev->input_dev,
@@ -601,7 +601,7 @@ static const struct sd_desc sd_desc = {
601 .init = sd_init, 601 .init = sd_init,
602 .start = sd_start, 602 .start = sd_start,
603 .stopN = sd_stopN, 603 .stopN = sd_stopN,
604#ifdef CONFIG_INPUT 604#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
605 .other_input = 1, 605 .other_input = 1,
606#endif 606#endif
607}; 607};