summaryrefslogtreecommitdiff
path: root/drivers/media/usb/au0828/au0828-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-18 15:51:28 +0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-23 00:51:19 +0400
commitb13b47e0b5eecbd18ebaa7f6657ca0f53eb783a3 (patch)
tree74896aa88111d7dfa5bb7ec3c76f406787b1ea11 /drivers/media/usb/au0828/au0828-cards.c
parent1ba3f927ad66759b0081fe1f96d77500c9a622c3 (diff)
downloadlinux-b13b47e0b5eecbd18ebaa7f6657ca0f53eb783a3.tar.xz
[media] au0828: explicitly identify boards with analog TV
Right now, the au0828 driver uses .tuner to detect if analog tv is being used or not. By not filling .tuner fields at the board struct, the I2C core can't do decisions based on it. So, add a field to explicitly tell when analog TV is supported. No functional changes. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/au0828/au0828-cards.c')
-rw-r--r--drivers/media/usb/au0828/au0828-cards.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c
index 585a8f84228c..9fd3c4b222f6 100644
--- a/drivers/media/usb/au0828/au0828-cards.c
+++ b/drivers/media/usb/au0828/au0828-cards.c
@@ -47,6 +47,7 @@ struct au0828_board au0828_boards[] = {
.tuner_type = TUNER_XC5000,
.tuner_addr = 0x61,
.has_ir_i2c = 1,
+ .has_analog = 1,
.i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
.input = {
{
@@ -73,6 +74,7 @@ struct au0828_board au0828_boards[] = {
.tuner_type = TUNER_XC5000,
.tuner_addr = 0x61,
.has_ir_i2c = 1,
+ .has_analog = 1,
.i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
.input = {
{
@@ -226,7 +228,7 @@ void au0828_card_analog_fe_setup(struct au0828_dev *dev)
}
/* Setup tuners */
- if (dev->board.tuner_type != TUNER_ABSENT) {
+ if (dev->board.tuner_type != TUNER_ABSENT && dev->board.has_analog) {
/* Load the tuner module, which does the attach */
sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
"tuner", dev->board.tuner_addr, NULL);