leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (6897): xc2028: ignore HAS_IF during specific S-Code type searches

Browse Source 
If we are selecting the S-Code firmware to load by name, then we must mask
off the HAS_IF bit during the search.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Chris Pascoe 2007-12-02 09:30:55 -03:00 committed by Mauro Carvalho Chehab
parent 0e614cd1a5
commit ef207feddf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/video/tuner-xc2028.c
View File

@ -395,6 +395,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
{ {
struct xc2028_data *priv = fe->tuner_priv; struct xc2028_data *priv = fe->tuner_priv;
int i, best_i = -1, best_nr_matches = 0; int i, best_i = -1, best_nr_matches = 0;
unsigned int ign_firm_type_mask = 0;
tuner_dbg("%s called, want type=", __FUNCTION__); tuner_dbg("%s called, want type=", __FUNCTION__);
if (debug) { if (debug) {
@ -412,16 +413,18 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
if (type & BASE) if (type & BASE)
type &= BASE_TYPES; type &= BASE_TYPES;
else if (type & SCODE) else if (type & SCODE) {
type &= SCODE_TYPES; type &= SCODE_TYPES;
else if (type & DTV_TYPES) ign_firm_type_mask = HAS_IF;
} else if (type & DTV_TYPES)
type &= DTV_TYPES; type &= DTV_TYPES;
else if (type & STD_SPECIFIC_TYPES) else if (type & STD_SPECIFIC_TYPES)
type &= STD_SPECIFIC_TYPES; type &= STD_SPECIFIC_TYPES;
/* Seek for exact match */ /* Seek for exact match */
for (i = 0; i < priv->firm_size; i++) { for (i = 0; i < priv->firm_size; i++) {
if ((type == priv->firm[i].type) && (*id == priv->firm[i].id)) if ((type == (priv->firm[i].type & ~ign_firm_type_mask)) &&
(*id == priv->firm[i].id))
goto found; goto found;
} }
@ -430,7 +433,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
v4l2_std_id match_mask; v4l2_std_id match_mask;
int nr_matches; int nr_matches;
if (type != priv->firm[i].type) if (type != (priv->firm[i].type & ~ign_firm_type_mask))
continue; continue;
match_mask = *id & priv->firm[i].id; match_mask = *id & priv->firm[i].id;