]> err.no Git - linux-2.6/commit
[PATCH] I2C: Kill i2c_algorithm.id (6/7)
authorJean Delvare <khali@linux-fr.org>
Thu, 11 Aug 2005 21:51:10 +0000 (23:51 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Sep 2005 16:14:32 +0000 (09:14 -0700)
commit1684a984303abbfc39aa8b59b0fe825c717811a9
tree5ba646c7c81f1ed3a2bbc032a412dcff21fc7c37
parentc7a46533ff7ef9e1c51bae6e54208527c5275b24
[PATCH] I2C: Kill i2c_algorithm.id (6/7)

In theory, there should be no more users of I2C_ALGO_* at this point.
However, it happens that several drivers were using I2C_ALGO_* for
adapter ids, so we need to correct these before we can get rid of all
the I2C_ALGO_* definitions.

Note that this also fixes a bug in media/video/tvaudio.c:

/* don't attach on saa7146 based cards,
   because dedicated drivers are used */
if ((adap->id & I2C_ALGO_SAA7146))
return 0;

This test was plain broken, as it would succeed for many more adapters
than just the saa7146: any those id would share at least one bit with
the saa7146 id. We are really lucky that the few other adapters we want
this driver to work with did not fulfill that condition.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
20 files changed:
drivers/i2c/busses/i2c-keywest.c
drivers/i2c/busses/scx200_acb.c
drivers/media/common/saa7146_i2c.c
drivers/media/dvb/b2c2/flexcop-i2c.c
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
drivers/media/dvb/pluto2/pluto2.c
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
drivers/media/video/ir-kbd-i2c.c
drivers/media/video/saa7134/saa7134-i2c.c
drivers/media/video/tda9840.c
drivers/media/video/tda9887.c
drivers/media/video/tea6415c.c
drivers/media/video/tea6420.c
drivers/media/video/tvaudio.c
drivers/video/aty/radeon_i2c.c
drivers/video/nvidia/nv_i2c.c
drivers/video/riva/rivafb-i2c.c
drivers/video/savage/savagefb-i2c.c
include/linux/i2c-id.h
include/media/id.h