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);