diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2012-11-25 09:37:37 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-22 21:17:37 (GMT) |
| commit | 960da93ba56f281261038e85c57ee3ec942dc734 (patch) | |
| tree | 839a428671cb739e33c0682278f45d4e281e0171 /drivers/media/usb/em28xx/em28xx.h | |
| parent | 79ff8697e98295606a55f7426930affe1322f9eb (diff) | |
| download | linux-fsl-qoriq-960da93ba56f281261038e85c57ee3ec942dc734.tar.xz | |
[media] em28xx: use common urb data copying function for vbi and non-vbi data streams
em28xx_urb_data_copy_vbi() is actually an extended version of
em28xx_urb_data_copy(). With the preceding fixes and improvements, it works
fine with both, vbi and non-vbi data streams without performance impacts.
So rename em28xx_urb_data_copy_vbi() to em28xx_urb_data_copy(), delete the
the old implementation of em28xx_urb_data_copy() and change the code to use
this function for both data stream types.
Tested with "SilverCrest 1.3 MPix webcam" (progressive, non-vbi) and
"Hauppauge HVR-900 (65008/A1C0)" (interlaced, vbi enabled and disabled).
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 09df56a..304896d 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -560,10 +560,10 @@ struct em28xx { /* states */ enum em28xx_dev_state state; - /* vbi related state tracking */ + /* capture state tracking */ int capture_type; - int vbi_read; unsigned char top_field:1; + int vbi_read; unsigned int vbi_width; unsigned int vbi_height; /* lines per field */ |