]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
[media] saa7164: saa7164-buffer.c line 274 bugfix
authorSteven Toth <stoth@kernellabs.com>
Sun, 5 Sep 2010 12:49:43 +0000 (09:49 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 09:55:19 +0000 (07:55 -0200)
Mark buffers free when the dvb dma engine stops.

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa7164/saa7164-dvb.c

index 2d21c01dea294428d92edeec9179bdef63e140cc..b305a01b3bdec6c7875b6d4aad7d6a513c9b9dcf 100644 (file)
@@ -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;
 }