diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-08-11 23:51:10 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:32 -0700 |
commit | 1684a984303abbfc39aa8b59b0fe825c717811a9 (patch) | |
tree | 5ba646c7c81f1ed3a2bbc032a412dcff21fc7c37 /drivers/video/riva | |
parent | c7a46533ff7ef9e1c51bae6e54208527c5275b24 (diff) | |
download | kernel_samsung_smdk4412-1684a984303abbfc39aa8b59b0fe825c717811a9.zip kernel_samsung_smdk4412-1684a984303abbfc39aa8b59b0fe825c717811a9.tar.gz kernel_samsung_smdk4412-1684a984303abbfc39aa8b59b0fe825c717811a9.tar.bz2 |
[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>
Diffstat (limited to 'drivers/video/riva')
-rw-r--r-- | drivers/video/riva/rivafb-i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c index da1334d..77151d8 100644 --- a/drivers/video/riva/rivafb-i2c.c +++ b/drivers/video/riva/rivafb-i2c.c @@ -92,14 +92,13 @@ static int riva_gpio_getsda(void* data) return val; } -#define I2C_ALGO_RIVA 0x0e0000 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name) { int rc; strcpy(chan->adapter.name, name); chan->adapter.owner = THIS_MODULE; - chan->adapter.id = I2C_ALGO_RIVA; + chan->adapter.id = I2C_HW_B_RIVA; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pdev->dev; chan->algo.setsda = riva_gpio_setsda; |