Skip to content

Commit

Permalink
V4L/DVB (6640): xc2028: correctly select 8MHz firmware
Browse files Browse the repository at this point in the history
We were using priv->bandwidth to select the base firmware to load, not the
requested bandwidth value, oops.  Also, 7MHz Digital TV needs 8MHz base
firmware loaded.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Chris Pascoe authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 2ce4b3a commit ddf1c5f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/media/video/tuner-xc2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,8 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
if (priv->ctrl.type == XC2028_FIRM_MTS)
type0 |= MTS;

if (priv->bandwidth == 8)
if (bandwidth == BANDWIDTH_7_MHZ ||
bandwidth == BANDWIDTH_8_MHZ)
type0 |= F8MHZ;

/* FIXME: How to load FM and FM|INPUT1 firmwares? */
Expand Down Expand Up @@ -814,7 +815,8 @@ static int xc2028_set_tv_freq(struct dvb_frontend *fe,
tuner_dbg("%s called\n", __FUNCTION__);

return generic_set_tv_freq(fe, 62500l * p->frequency, T_ANALOG_TV,
p->std, BANDWIDTH_8_MHZ /* NOT USED */);
p->std, BANDWIDTH_8_MHZ);
/* XXX Are some analog standards 6MHz? */
}

static int xc2028_set_params(struct dvb_frontend *fe,
Expand Down

0 comments on commit ddf1c5f

Please sign in to comment.