diff --git a/[refs] b/[refs]
index 2b2d74690bf0..6aa688f1a57b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6740a932882f43056b8545e5b0b85511975d0a7c
+refs/heads/master: 2a887d27708a4f9f3b5ad8258f9e19a150b58f03
diff --git a/trunk/drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/media/video/tm6000/tm6000-input.c
index e3467d4245cb..af4bcf5288a9 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-input.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-input.c
@@ -377,6 +377,9 @@ int tm6000_ir_int_start(struct tm6000_core *dev)
 {
 	struct tm6000_IR *ir = dev->ir;
 
+	if (!ir)
+		return;
+
 	return __tm6000_ir_int_start(ir->rc);
 }
 
@@ -384,6 +387,9 @@ void tm6000_ir_int_stop(struct tm6000_core *dev)
 {
 	struct tm6000_IR *ir = dev->ir;
 
+	if (!ir || !ir->rc)
+		return;
+
 	__tm6000_ir_int_stop(ir->rc);
 }