From 27855e7609620a811900e7649e01992ef4eb951a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Fri, 17 Sep 2010 18:12:31 -0300
Subject: [PATCH] --- yaml --- r: 219167 b: refs/heads/master c:
 df1868e4ee605444bbb98505126bdfb3519749af h: refs/heads/master i:   219165:
 832207e96d5f2b2046d5f35d48be6033481d4b4e   219163:
 67fb500462475a1dcaf121e2629f685163314a87   219159:
 eef2a3c16962e547845c15e51e324f12d051c2b7   219151:
 618291df68cf68808f807ccaac0f65655a00248d   219135:
 0eda1b00caf478aa3cb52937339783f06171e750 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/media/IR/lirc_dev.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 56af2830fdb6..0de226cb2123 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04292fc0031a28d298dfa03c4cd9ce6abef9b4e0
+refs/heads/master: df1868e4ee605444bbb98505126bdfb3519749af
diff --git a/trunk/drivers/media/IR/lirc_dev.c b/trunk/drivers/media/IR/lirc_dev.c
index 899891bec352..0572053a7944 100644
--- a/trunk/drivers/media/IR/lirc_dev.c
+++ b/trunk/drivers/media/IR/lirc_dev.c
@@ -366,6 +366,11 @@ int lirc_unregister_driver(int minor)
 	}
 
 	ir = irctls[minor];
+	if (!ir) {
+		printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
+		       "failed to get irctl struct for minor %d!", minor);
+		return -ENOENT;
+	}
 
 	mutex_lock(&lirc_dev_lock);