Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/media/video/bt832.c

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
MODULE_LICENSE("GPL");



/* Addresses to scan */

static unsigned short normal_i2c[] = {I2C_CLIENT_END};

static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1>>1,I2C_BT832_ALT2>>1,I2C_CLIENT_END};

static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,

				       I2C_CLIENT_END };

I2C_CLIENT_INSMOD;



/* ---------------------------------------------------------------------- */

drivers/media/video/msp3400.c

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static unsigned short normal_i2c[] = { 
	I2C_MSP3400C_ALT  >> 1,

	I2C_CLIENT_END

};

static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};

I2C_CLIENT_INSMOD;



/* ----------------------------------------------------------------------- */

drivers/media/video/saa7134/saa6752hs.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


/* Addresses to scan */

static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};

static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};

I2C_CLIENT_INSMOD;



MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");

drivers/media/video/tda7432.c

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static unsigned short normal_i2c[] = { 
	I2C_TDA7432 >> 1,

	I2C_CLIENT_END,

};

static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END };

I2C_CLIENT_INSMOD;



/* Structure of address and subaddresses for the tda7432 */

drivers/media/video/tda9875.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static unsigned short normal_i2c[] = { 
    I2C_TDA9875 >> 1,

    I2C_CLIENT_END

};

static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};

I2C_CLIENT_INSMOD;



/* This is a superset of the TDA9875 */