diff --git a/[refs] b/[refs]
index 1a462fbc7e27..65d0f3ab77f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e732d64416b243883f753e4a00960c3f3709317
+refs/heads/master: a1c592b766ee94aaf0e2549b8ba4d0298c328484
diff --git a/trunk/drivers/media/video/saa7164/saa7164-dvb.c b/trunk/drivers/media/video/saa7164/saa7164-dvb.c
index 2d21c01dea29..b305a01b3bde 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-dvb.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-dvb.c
@@ -143,6 +143,8 @@ static int saa7164_dvb_pause_port(struct saa7164_port *port)
 static int saa7164_dvb_stop_streaming(struct saa7164_port *port)
 {
 	struct saa7164_dev *dev = port->dev;
+	struct saa7164_buffer *buf;
+	struct list_head *p, *q;
 	int ret;
 
 	dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
@@ -151,6 +153,14 @@ static int saa7164_dvb_stop_streaming(struct saa7164_port *port)
 	ret = saa7164_dvb_acquire_port(port);
 	ret = saa7164_dvb_stop_port(port);
 
+	/* Mark the hardware buffers as free */
+	mutex_lock(&port->dmaqueue_lock);
+	list_for_each_safe(p, q, &port->dmaqueue.list) {
+		buf = list_entry(p, struct saa7164_buffer, list);
+		buf->flags = SAA7164_BUFFER_FREE;
+	}
+	mutex_unlock(&port->dmaqueue_lock);
+
 	return ret;
 }