Commit f5bec396 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds

[PATCH] v4l: fix I2C detect after normal_i2c_range()

This patch is necessary to correct I2C detect after normal_i2c_range
removal in gregkh-i2c-i2c-address_range_removal.patch.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ac19ecc6
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = {I2C_CLIENT_END}; static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1>>1,I2C_BT832_ALT2>>1,I2C_CLIENT_END}; I2C_CLIENT_END };
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
......
...@@ -147,7 +147,6 @@ static unsigned short normal_i2c[] = { ...@@ -147,7 +147,6 @@ static unsigned short normal_i2c[] = {
I2C_MSP3400C_ALT >> 1, I2C_MSP3400C_ALT >> 1,
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END}; static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder"); MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
......
...@@ -74,7 +74,6 @@ static unsigned short normal_i2c[] = { ...@@ -74,7 +74,6 @@ static unsigned short normal_i2c[] = {
I2C_TDA7432 >> 1, I2C_TDA7432 >> 1,
I2C_CLIENT_END, I2C_CLIENT_END,
}; };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END };
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
/* Structure of address and subaddresses for the tda7432 */ /* Structure of address and subaddresses for the tda7432 */
......
...@@ -44,7 +44,6 @@ static unsigned short normal_i2c[] = { ...@@ -44,7 +44,6 @@ static unsigned short normal_i2c[] = {
I2C_TDA9875 >> 1, I2C_TDA9875 >> 1,
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
/* This is a superset of the TDA9875 */ /* This is a superset of the TDA9875 */
......
...@@ -33,7 +33,6 @@ static unsigned short normal_i2c[] = { ...@@ -33,7 +33,6 @@ static unsigned short normal_i2c[] = {
0x96 >>1, 0x96 >>1,
I2C_CLIENT_END, I2C_CLIENT_END,
}; };
static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
/* insmod options */ /* insmod options */
......
...@@ -33,10 +33,8 @@ ...@@ -33,10 +33,8 @@
/* standard i2c insmod options */ /* standard i2c insmod options */
static unsigned short normal_i2c[] = { static unsigned short normal_i2c[] = {
0x4b, /* tda8290 */ 0x4b, /* tda8290 */
I2C_CLIENT_END 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
}; 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
static unsigned short normal_i2c_range[] = {
0x60, 0x6f,
I2C_CLIENT_END I2C_CLIENT_END
}; };
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
...@@ -322,9 +320,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -322,9 +320,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
static int tuner_probe(struct i2c_adapter *adap) static int tuner_probe(struct i2c_adapter *adap)
{ {
if (0 != addr) { if (0 != addr) {
normal_i2c[0] = addr; normal_i2c[0] = addr;
normal_i2c_range[0] = addr; normal_i2c[1] = I2C_CLIENT_END;
normal_i2c_range[1] = addr;
} }
this_adap = 0; this_adap = 0;
......
...@@ -148,7 +148,6 @@ static unsigned short normal_i2c[] = { ...@@ -148,7 +148,6 @@ static unsigned short normal_i2c[] = {
I2C_TDA9874 >> 1, I2C_TDA9874 >> 1,
I2C_PIC16C54 >> 1, I2C_PIC16C54 >> 1,
I2C_CLIENT_END }; I2C_CLIENT_END };
static unsigned short normal_i2c_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
static struct i2c_driver driver; static struct i2c_driver driver;
......
...@@ -482,7 +482,6 @@ static unsigned short normal_i2c[] = { ...@@ -482,7 +482,6 @@ static unsigned short normal_i2c[] = {
0xa0 >> 1, 0xa0 >> 1,
I2C_CLIENT_END, I2C_CLIENT_END,
}; };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
struct i2c_driver i2c_driver_tveeprom; struct i2c_driver i2c_driver_tveeprom;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment