1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index ba7a74979dfb..58a1ddddb09e 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -509,9 +509,9 @@ static int ir_probe(struct i2c_adapter *adap)
         static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
         static const int probe_cx23885[] = { 0x6b, -1 };
         const int *probe = NULL;
-        struct i2c_client c;
+        struct i2c_client *c;
         unsigned char buf;
-        int i,rc;
+        int i, rc;
 
         switch (adap->id) {
         case I2C_HW_B_BT848:
@@ -536,19 +536,23 @@ static int ir_probe(struct i2c_adapter *adap)
         if (NULL == probe)
                 return 0;
 
-        memset(&c,0,sizeof(c));
-        c.adapter = adap;
+        c = kzalloc(sizeof(*c), GFP_KERNEL);
+        if (!c)
+                return -ENOMEM;
+
+        c->adapter = adap;
         for (i = 0; -1 != probe[i]; i++) {
-                c.addr = probe[i];
-                rc = i2c_master_recv(&c,&buf,0);
+                c->addr = probe[i];
+                rc = i2c_master_recv(c, &buf, 0);
                 dprintk(1,"probe 0x%02x @ %s: %s\n",
                         probe[i], adap->name,
                         (0 == rc) ? "yes" : "no");
                 if (0 == rc) {
-                        ir_attach(adap,probe[i],0,0);
+                        ir_attach(adap, probe[i], 0, 0);
                         break;
                 }
         }
+        kfree(c);
         return 0;
 }