diff --git a/[refs] b/[refs]
index 76c9547d56a0..8d937c67e26e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71d67f739e0b02995c2eb650448f031b76720307
+refs/heads/master: dcf5d3aa081617a4a8aa56b7e24988d600148f50
diff --git a/trunk/drivers/staging/tm6000/tm6000-dvb.c b/trunk/drivers/staging/tm6000/tm6000-dvb.c
index eafc89c22b6b..e6a802e9c48a 100644
--- a/trunk/drivers/staging/tm6000/tm6000-dvb.c
+++ b/trunk/drivers/staging/tm6000/tm6000-dvb.c
@@ -100,7 +100,10 @@ int tm6000_start_stream(struct tm6000_core *dev)
 
 	printk(KERN_INFO "tm6000: got start stream request %s\n",__FUNCTION__);
 
-	tm6000_init_digital_mode(dev);
+	if (dev->mode != TM6000_MODE_DIGITAL) {
+		tm6000_init_digital_mode(dev);
+		dev->mode = TM6000_MODE_DIGITAL;
+	}
 
 	dvb->bulk_urb = usb_alloc_urb(0, GFP_KERNEL);
 	if(dvb->bulk_urb == NULL) {