Skip to content

Commit

Permalink
V4L/DVB: saa7146/tuner: remove mxb hack
Browse files Browse the repository at this point in the history
Remove a hack in the tuner code for the mxb board. This hack is no longer
needed since the tuner is now probed on its correct address as specified
by the mxb driver.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent 1edc246 commit a644c07
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion drivers/media/common/saa7146_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,6 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
i2c_adapter->dev.parent = &dev->pci->dev;
i2c_adapter->algo = &saa7146_algo;
i2c_adapter->algo_data = NULL;
i2c_adapter->id = I2C_HW_SAA7146;
i2c_adapter->timeout = SAA7146_I2C_TIMEOUT;
i2c_adapter->retries = SAA7146_I2C_RETRIES;
}
Expand Down
6 changes: 0 additions & 6 deletions drivers/media/video/tuner-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1052,12 +1052,6 @@ static int tuner_probe(struct i2c_client *client,
printk(KERN_CONT "%02x ", buffer[i]);
printk("\n");
}
/* HACK: This test was added to avoid tuner to probe tda9840 and
tea6415c on the MXB card */
if (client->adapter->id == I2C_HW_SAA7146 && client->addr < 0x4a) {
kfree(t);
return -ENODEV;
}

/* autodetection code based on the i2c addr */
if (!no_autodetect) {
Expand Down

0 comments on commit a644c07

Please sign in to comment.