Skip to content

Commit

Permalink
V4L/DVB (6660): Allow fully configuring xc3028 during xc2028_attach
Browse files Browse the repository at this point in the history
xc3028 can be used on some DTV only designs (for example, DVB-S boards). Before
this patch, a DTV only board would need to call set_tuner_config callback.

This patch allows to optionally pass a xc3028_ctrl parameter, via xc3028_config
struct, fully initializing the driver for DTV.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 5add9a6 commit 71a2ee3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/media/video/tuner-xc2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
if (debug)
printk(KERN_DEBUG PREFIX ": Xcv2028/3028 init called!\n");

if (NULL == cfg->video_dev)
if (NULL == cfg || NULL == cfg->video_dev)
return NULL;

if (!fe) {
Expand Down Expand Up @@ -1106,6 +1106,9 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)

tuner_info("type set to %s\n", "XCeive xc2028/xc3028 tuner");

if (cfg->ctrl)
xc2028_set_config(fe, cfg->ctrl);

mutex_unlock(&xc2028_list_mutex);

return fe;
Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/tuner-xc2028.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ struct xc2028_config {
struct i2c_adapter *i2c_adap;
u8 i2c_addr;
void *video_dev;
struct xc2028_ctrl *ctrl;
int (*callback) (void *dev, int command, int arg);
};

Expand Down

0 comments on commit 71a2ee3

Please sign in to comment.