---

yaml --- r: 92358 b: refs/heads/master c: 65e8d29 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · a394b89 · a394b89
1 parent 221c1cb
commit a394b89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82b3083d2673e5fe8ac508071038b2b4c10bbf9c
+refs/heads/master: 65e8d29f7a37faaf9c73c633447bebd4b31b2c89
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
@@ -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) {

diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
@@ -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;