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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index f42a1efa8fcf..9420b5f52915 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1098,7 +1098,7 @@ static int tda8425_initialize(struct CHIPSTATE *chip)
1098 /* extern */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF, 1098 /* extern */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
1099 /* off */ TDA8425_S1_OFF, /* on */ TDA8425_S1_CH2}; 1099 /* off */ TDA8425_S1_OFF, /* on */ TDA8425_S1_CH2};
1100 1100
1101 if (chip->c.adapter->id == (I2C_ALGO_BIT | I2C_HW_B_RIVA)) { 1101 if (chip->c.adapter->id == I2C_HW_B_RIVA) {
1102 memcpy (desc->inputmap, inputmap, sizeof (inputmap)); 1102 memcpy (desc->inputmap, inputmap, sizeof (inputmap));
1103 } 1103 }
1104 return 0; 1104 return 0;
@@ -1555,8 +1555,8 @@ static int chip_probe(struct i2c_adapter *adap)
1555 return i2c_probe(adap, &addr_data, chip_attach); 1555 return i2c_probe(adap, &addr_data, chip_attach);
1556#else 1556#else
1557 switch (adap->id) { 1557 switch (adap->id) {
1558 case I2C_ALGO_BIT | I2C_HW_B_BT848: 1558 case I2C_HW_B_BT848:
1559 case I2C_ALGO_BIT | I2C_HW_B_RIVA: 1559 case I2C_HW_B_RIVA:
1560 case I2C_ALGO_SAA7134: 1560 case I2C_ALGO_SAA7134:
1561 return i2c_probe(adap, &addr_data, chip_attach); 1561 return i2c_probe(adap, &addr_data, chip_attach);
1562 } 1562 }