1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 3a8880243b1f..86f2fefe1edf 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -298,7 +298,7 @@ static void ir_work(struct work_struct *work)
 static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         IR_KEYTAB_TYPE *ir_codes = NULL;
-        const char *name;
+        const char *name = NULL;
         int ir_type;
         struct IR_i2c *ir;
         struct input_dev *input_dev;
@@ -380,8 +380,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 ir_codes    = ir_codes_avermedia_cardbus;
                 break;
         default:
-                /* shouldn't happen */
-                printk(DEVNAME ": Huh? unknown i2c address (0x%02x)?\n", addr);
+                dprintk(1, DEVNAME ": Unsupported i2c address 0x%02x\n", addr);
                 err = -ENODEV;
                 goto err_out_free;
         }
@@ -396,6 +395,14 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 ir->get_key = init_data->get_key;
         }
 
+        /* Make sure we are all setup before going on */
+        if (!name || !ir->get_key || !ir_codes) {
+                dprintk(1, DEVNAME ": Unsupported device at address 0x%02x\n",
+                        addr);
+                err = -ENODEV;
+                goto err_out_free;
+        }
+
         /* Sets name */
         snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name);
         ir->ir_codes = ir_codes;