diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.c b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
index a8a76434989c..61186d219b7b 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_bridge.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
@@ -543,6 +543,11 @@ static void vidtv_bridge_remove(struct platform_device *pdev)

 	dvb = platform_get_drvdata(pdev);

+	mutex_lock(&dvb->feed_lock);
+	if (dvb->streaming)
+		vidtv_stop_streaming(dvb);
+	mutex_unlock(&dvb->feed_lock);
+
 #ifdef CONFIG_MEDIA_CONTROLLER_DVB
 	media_device_unregister(&dvb->mdev);
 	media_device_cleanup(&dvb->mdev);