diff --git a/[refs] b/[refs]
index ccebcb37645a..3b49ed03414e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04574a6881cd4b49b49ba95f893520dabe1d76f5
+refs/heads/master: 80af6bb73e52c614e0571f82e4dd88a6941066a4
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index f6be4c5d88ca..e1a6c1666543 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -421,6 +421,7 @@ static int tm6000_init_dev(struct tm6000_core *dev)
 		}
 #endif
 	}
+	return 0;
 
 err2:
 	v4l2_device_unregister(&dev->v4l2_dev);