From b2967504e6759c56503c3bd8055f07287cb0207d Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 6 Dec 2009 08:32:49 -0300
Subject: [PATCH] --- yaml --- r: 176792 b: refs/heads/master c:
 05395a3d86a928d374c970a0b35a6a711072f86c h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/common/ir-keytable.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 56d1a2ad9a91..6c0590e887f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b779974bdfcaec2a0eb13e44405baca07e0e92a3
+refs/heads/master: 05395a3d86a928d374c970a0b35a6a711072f86c
diff --git a/trunk/drivers/media/common/ir-keytable.c b/trunk/drivers/media/common/ir-keytable.c
index 26ce5bc2fdd5..ceef0e82fb4b 100644
--- a/trunk/drivers/media/common/ir-keytable.c
+++ b/trunk/drivers/media/common/ir-keytable.c
@@ -419,6 +419,9 @@ void ir_input_free(struct input_dev *dev)
 {
 	struct ir_scancode_table *rc_tab = input_get_drvdata(dev);
 
+	if (!rc_tab)
+		return;
+
 	IR_dprintk(1, "Freed keycode table\n");
 
 	rc_tab->size = 0;