aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tvaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/tvaudio.c')
-rw-r--r--drivers/media/video/tvaudio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 9420b5f52915..f6aab89593ea 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1548,7 +1548,7 @@ static int chip_probe(struct i2c_adapter *adap)
1548{ 1548{
1549 /* don't attach on saa7146 based cards, 1549 /* don't attach on saa7146 based cards,
1550 because dedicated drivers are used */ 1550 because dedicated drivers are used */
1551 if ((adap->id & I2C_ALGO_SAA7146)) 1551 if (adap->id == I2C_HW_SAA7146)
1552 return 0; 1552 return 0;
1553#ifdef I2C_CLASS_TV_ANALOG 1553#ifdef I2C_CLASS_TV_ANALOG
1554 if (adap->class & I2C_CLASS_TV_ANALOG) 1554 if (adap->class & I2C_CLASS_TV_ANALOG)
@@ -1557,7 +1557,7 @@ static int chip_probe(struct i2c_adapter *adap)
1557 switch (adap->id) { 1557 switch (adap->id) {
1558 case I2C_HW_B_BT848: 1558 case I2C_HW_B_BT848:
1559 case I2C_HW_B_RIVA: 1559 case I2C_HW_B_RIVA:
1560 case I2C_ALGO_SAA7134: 1560 case I2C_HW_SAA7134:
1561 return i2c_probe(adap, &addr_data, chip_attach); 1561 return i2c_probe(adap, &addr_data, chip_attach);
1562 } 1562 }
1563#endif 1563#endif