tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Mauro Carvalho Chehab and committed by Linus Torvalds f5bec396 ac19ecc6

+6 -16
unified split
+2 -2
drivers/media/video/bt832.c
··· 39 MODULE_LICENSE("GPL"); 40 41 /* Addresses to scan */ 42 - static unsigned short normal_i2c[] = {I2C_CLIENT_END}; 43 - static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1>>1,I2C_BT832_ALT2>>1,I2C_CLIENT_END}; 44 I2C_CLIENT_INSMOD; 45 46 /* ---------------------------------------------------------------------- */
··· 39 MODULE_LICENSE("GPL"); 40 41 /* Addresses to scan */ 42 + static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1, 43 + I2C_CLIENT_END }; 44 I2C_CLIENT_INSMOD; 45 46 /* ---------------------------------------------------------------------- */
-1
drivers/media/video/msp3400.c
··· 147 I2C_MSP3400C_ALT >> 1, 148 I2C_CLIENT_END 149 }; 150 - static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END}; 151 I2C_CLIENT_INSMOD; 152 153 /* ----------------------------------------------------------------------- */
··· 147 I2C_MSP3400C_ALT >> 1, 148 I2C_CLIENT_END 149 }; 150 I2C_CLIENT_INSMOD; 151 152 /* ----------------------------------------------------------------------- */
-1
drivers/media/video/saa7134/saa6752hs.c
··· 22 23 /* Addresses to scan */ 24 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END}; 25 - static unsigned short normal_i2c_range[] = {I2C_CLIENT_END}; 26 I2C_CLIENT_INSMOD; 27 28 MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
··· 22 23 /* Addresses to scan */ 24 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END}; 25 I2C_CLIENT_INSMOD; 26 27 MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
-1
drivers/media/video/tda7432.c
··· 74 I2C_TDA7432 >> 1, 75 I2C_CLIENT_END, 76 }; 77 - static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END }; 78 I2C_CLIENT_INSMOD; 79 80 /* Structure of address and subaddresses for the tda7432 */
··· 74 I2C_TDA7432 >> 1, 75 I2C_CLIENT_END, 76 }; 77 I2C_CLIENT_INSMOD; 78 79 /* Structure of address and subaddresses for the tda7432 */
-1
drivers/media/video/tda9875.c
··· 44 I2C_TDA9875 >> 1, 45 I2C_CLIENT_END 46 }; 47 - static unsigned short normal_i2c_range[] = {I2C_CLIENT_END}; 48 I2C_CLIENT_INSMOD; 49 50 /* This is a superset of the TDA9875 */
··· 44 I2C_TDA9875 >> 1, 45 I2C_CLIENT_END 46 }; 47 I2C_CLIENT_INSMOD; 48 49 /* This is a superset of the TDA9875 */
-1
drivers/media/video/tda9887.c
··· 33 0x96 >>1, 34 I2C_CLIENT_END, 35 }; 36 - static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END}; 37 I2C_CLIENT_INSMOD; 38 39 /* insmod options */
··· 33 0x96 >>1, 34 I2C_CLIENT_END, 35 }; 36 I2C_CLIENT_INSMOD; 37 38 /* insmod options */
+4 -7
drivers/media/video/tuner-core.c
··· 33 /* standard i2c insmod options */ 34 static unsigned short normal_i2c[] = { 35 0x4b, /* tda8290 */ 36 - I2C_CLIENT_END 37 - }; 38 - static unsigned short normal_i2c_range[] = { 39 - 0x60, 0x6f, 40 I2C_CLIENT_END 41 }; 42 I2C_CLIENT_INSMOD; ··· 320 static int tuner_probe(struct i2c_adapter *adap) 321 { 322 if (0 != addr) { 323 - normal_i2c[0] = addr; 324 - normal_i2c_range[0] = addr; 325 - normal_i2c_range[1] = addr; 326 } 327 this_adap = 0; 328
··· 33 /* standard i2c insmod options */ 34 static unsigned short normal_i2c[] = { 35 0x4b, /* tda8290 */ 36 + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 37 + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 38 I2C_CLIENT_END 39 }; 40 I2C_CLIENT_INSMOD; ··· 322 static int tuner_probe(struct i2c_adapter *adap) 323 { 324 if (0 != addr) { 325 + normal_i2c[0] = addr; 326 + normal_i2c[1] = I2C_CLIENT_END; 327 } 328 this_adap = 0; 329
-1
drivers/media/video/tvaudio.c
··· 148 I2C_TDA9874 >> 1, 149 I2C_PIC16C54 >> 1, 150 I2C_CLIENT_END }; 151 - static unsigned short normal_i2c_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; 152 I2C_CLIENT_INSMOD; 153 154 static struct i2c_driver driver;
··· 148 I2C_TDA9874 >> 1, 149 I2C_PIC16C54 >> 1, 150 I2C_CLIENT_END }; 151 I2C_CLIENT_INSMOD; 152 153 static struct i2c_driver driver;
-1
drivers/media/video/tveeprom.c
··· 482 0xa0 >> 1, 483 I2C_CLIENT_END, 484 }; 485 - static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; 486 I2C_CLIENT_INSMOD; 487 488 struct i2c_driver i2c_driver_tveeprom;
··· 482 0xa0 >> 1, 483 I2C_CLIENT_END, 484 }; 485 I2C_CLIENT_INSMOD; 486 487 struct i2c_driver i2c_driver_tveeprom;