2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 770dbcbecb63..4d791766ce11 100644
--- a/drivers/media/video/tuner-core.c
+++ b/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/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 85556d44c8ab..d3362703e258 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/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;