OSDN Git Service

[media] v4l2: bfin: Ensure delete and reinit list entry on NOMMU architecture
authorSonic Zhang <sonic.zhang@analog.com>
Wed, 23 Jul 2014 09:57:15 +0000 (06:57 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sat, 26 Jul 2014 20:14:14 +0000 (17:14 -0300)
On NOMMU architecture page fault is not triggered if a deleted list entry is
accessed without reinit.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/blackfin/bfin_capture.c

index 7c70d51..9b5daa6 100644 (file)
@@ -446,7 +446,7 @@ static void bcap_stop_streaming(struct vb2_queue *vq)
        while (!list_empty(&bcap_dev->dma_queue)) {
                bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
                                                struct bcap_buffer, list);
-               list_del(&bcap_dev->cur_frm->list);
+               list_del_init(&bcap_dev->cur_frm->list);
                vb2_buffer_done(&bcap_dev->cur_frm->vb, VB2_BUF_STATE_ERROR);
        }
 }
@@ -533,7 +533,7 @@ static irqreturn_t bcap_isr(int irq, void *dev_id)
                }
                bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
                                struct bcap_buffer, list);
-               list_del(&bcap_dev->cur_frm->list);
+               list_del_init(&bcap_dev->cur_frm->list);
        } else {
                /* clear error flag, we will get a new frame */
                if (ppi->err)
@@ -583,7 +583,7 @@ static int bcap_streamon(struct file *file, void *priv,
        bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
                                        struct bcap_buffer, list);
        /* remove buffer from the dma queue */
-       list_del(&bcap_dev->cur_frm->list);
+       list_del_init(&bcap_dev->cur_frm->list);
        addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0);
        /* update DMA address */
        ppi->ops->update_addr(ppi, (unsigned long)addr);