diff --git a/[refs] b/[refs]
index 1e3f44665e50..bd4b656185c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a16fa71d6b2f96cb483b82ffac07459ae0939c1d
+refs/heads/master: 56a8b9f181b5e9b201ab02ad0b63ccdc17d4b191
diff --git a/trunk/drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/media/video/tm6000/tm6000-input.c
index 89e003c0cfed..8d925274c8d6 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-input.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-input.c
@@ -378,7 +378,7 @@ int tm6000_ir_int_start(struct tm6000_core *dev)
 	struct tm6000_IR *ir = dev->ir;
 
 	if (!ir)
-		return;
+		return 0;
 
 	return __tm6000_ir_int_start(ir->rc);
 }