system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-28 15:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (7126): tuner: move tuner type ID check to simple_tuner_attach

Browse source 
Move tuner type ID check from tuner-core::set_type to simple_tuner_attach.

Since tuner-core forwards all attach requests to tuner-simple as the
default case, unless a specific attach function is specified in
set_type, this change is an appropriate cleanup.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2008-04-22 14:41:50 -03:00 committed by Mauro Carvalho Chehab
parent 82b3083d26
commit 65e8d29f7a
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/video/tuner-core.c
View file

@ -352,11 +352,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
return;
}
if (type >= tuner_count) {
tuner_warn ("tuner 0x%02x: Tuner count greater than %d\n",c->addr,tuner_count);
return;
}
t->type = type;
t->config = new_config;
if (tuner_callback != NULL) {

6
drivers/media/video/tuner-simple.c
View file

@ -688,6 +688,12 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
{
struct tuner_simple_priv *priv = NULL;
if (type >= tuner_count) {
printk(KERN_WARNING "%s: invalid tuner type: %d (max: %d)\n",
__FUNCTION__, type, tuner_count-1);
return NULL;
}
priv = kzalloc(sizeof(struct tuner_simple_priv), GFP_KERNEL);
if (priv == NULL)
return NULL;