From a4cfec8ff926362bd598d90967f7933c11618b29 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 14 Dec 2011 02:17:36 -0300 Subject: [PATCH] --- yaml --- r: 285448 b: refs/heads/master c: b16ec6f735b8f8588c7c3e7703f7ad6267715eb8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tm6000/tm6000-input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bcc62abf41d3..e95502d305f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6563cbf87b24d509e2f41d220637179cd16b9fc +refs/heads/master: b16ec6f735b8f8588c7c3e7703f7ad6267715eb8 diff --git a/trunk/drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/media/video/tm6000/tm6000-input.c index 8d925274c8d6..7844607dd45a 100644 --- a/trunk/drivers/media/video/tm6000/tm6000-input.c +++ b/trunk/drivers/media/video/tm6000/tm6000-input.c @@ -408,13 +408,13 @@ int tm6000_ir_init(struct tm6000_core *dev) if (!dev->ir_codes) return 0; - dprintk(2, "%s\n",__func__); - ir = kzalloc(sizeof(*ir), GFP_ATOMIC); rc = rc_allocate_device(); if (!ir || !rc) goto out; + dprintk(2, "%s\n", __func__); + /* record handles to ourself */ ir->dev = dev; dev->ir = ir;