From 8f9c1dc76f7d6f0142a79dc4336dc96c962c362f Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Sat, 9 Jan 2010 13:51:14 -0300 Subject: [PATCH] --- yaml --- r: 181502 b: refs/heads/master c: 8231152f74dd9bd6f76036cfd7fbbf94ad0073d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/ir-keytable.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b597edf89ea0..8dd6992b220b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78b06e0201fb32716211959bce133740a13873c4 +refs/heads/master: 8231152f74dd9bd6f76036cfd7fbbf94ad0073d8 diff --git a/trunk/drivers/media/IR/ir-keytable.c b/trunk/drivers/media/IR/ir-keytable.c index 161d70b57965..0903f539bf68 100644 --- a/trunk/drivers/media/IR/ir-keytable.c +++ b/trunk/drivers/media/IR/ir-keytable.c @@ -421,8 +421,10 @@ int ir_input_register(struct input_dev *input_dev, ir_dev->rc_tab.size = ir_roundup_tablesize(rc_tab->size); ir_dev->rc_tab.scan = kzalloc(ir_dev->rc_tab.size * sizeof(struct ir_scancode), GFP_KERNEL); - if (!ir_dev->rc_tab.scan) + if (!ir_dev->rc_tab.scan) { + kfree(ir_dev); return -ENOMEM; + } IR_dprintk(1, "Allocated space for %d keycode entries (%zd bytes)\n", ir_dev->rc_tab.size,