diff options
author | Hans de Goede <hdegoede@redhat.com> | 2010-10-27 06:42:28 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:31 -0500 |
commit | 614d06917de2823d598a4b231256d08074044235 (patch) | |
tree | 0106456b2adadef61f61fbafa7530ed8ccda29b5 | |
parent | e0657be5615f666f261206ed62c3f0dc2527956e (diff) |
[media] gspca_ov519: generate release button event on stream stop if needed
Generate a release button event when the button is still pressed when the
stream stops.
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/ov519.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index 6cf6855aa506..19f943e45ca2 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -3912,7 +3912,6 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
3912 | pressed while we weren't streaming */ | 3912 | pressed while we weren't streaming */ |
3913 | sd->snapshot_needs_reset = 1; | 3913 | sd->snapshot_needs_reset = 1; |
3914 | sd_reset_snapshot(gspca_dev); | 3914 | sd_reset_snapshot(gspca_dev); |
3915 | sd->snapshot_pressed = 0; | ||
3916 | 3915 | ||
3917 | sd->first_frame = 3; | 3916 | sd->first_frame = 3; |
3918 | 3917 | ||
@@ -3940,6 +3939,15 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
3940 | 3939 | ||
3941 | if (sd->bridge == BRIDGE_W9968CF) | 3940 | if (sd->bridge == BRIDGE_W9968CF) |
3942 | w9968cf_stop0(sd); | 3941 | w9968cf_stop0(sd); |
3942 | |||
3943 | #ifdef CONFIG_INPUT | ||
3944 | /* If the last button state is pressed, release it now! */ | ||
3945 | if (sd->snapshot_pressed) { | ||
3946 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); | ||
3947 | input_sync(gspca_dev->input_dev); | ||
3948 | sd->snapshot_pressed = 0; | ||
3949 | } | ||
3950 | #endif | ||
3943 | } | 3951 | } |
3944 | 3952 | ||
3945 | static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state) | 3953 | static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state) |