aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvision/usbvision.h
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2006-12-04 08:31:30 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 09:05:50 -0200
commit957883d0b56a649389d0652a727324dd8ba2e83c (patch)
tree25343acf88ebfe78803d8802ecb967d40899f315 /drivers/media/video/usbvision/usbvision.h
parentV4L/DVB (4931): Removed usbvision_ioctl.h, since it isn't required anymore (diff)
downloadlinux-dev-957883d0b56a649389d0652a727324dd8ba2e83c.tar.xz
linux-dev-957883d0b56a649389d0652a727324dd8ba2e83c.zip
V4L/DVB (4932): Usbvision_v4l2: fix norm setting problems
Patch contents: - fix i2c command broadcast (caused problems for SECAM norm setting) - default input selection at driver open Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision.h')
-rw-r--r--drivers/media/video/usbvision/usbvision.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index ef83a5c4d2fd..f304e66b03a6 100644
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -319,8 +319,6 @@ struct usbvision_frame {
#define BRIDGE_NT1004 1004
#define BRIDGE_NT1005 1005
-#define USBVISION_I2C_CLIENTS_MAX 8
-
struct usbvision_device_data_st {
int idVendor;
int idProduct;
@@ -355,8 +353,6 @@ struct usb_usbvision {
struct i2c_adapter i2c_adap;
struct i2c_algo_usb_data i2c_algo;
struct i2c_client i2c_client;
- int i2c_state, i2c_ok;
- struct i2c_client *i2c_clients[USBVISION_I2C_CLIENTS_MAX];
struct urb *ctrlUrb;
unsigned char ctrlUrbBuffer[8];
@@ -367,6 +363,7 @@ struct usb_usbvision {
int have_tuner;
int tuner_type;
+ int tuner_addr;
int bridgeType; // NT1003, NT1004, NT1005
int channel;
int radio;