From: Sonic Zhang Date: Wed, 23 Jul 2014 09:57:15 +0000 (-0300) Subject: [media] v4l2: bfin: Ensure delete and reinit list entry on NOMMU architecture X-Git-Tag: v3.17-rc1~112^2~51 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7ba3c21c17d0fec397dc5e0337a3548eb14220bd;p=~emulex%2Finfiniband.git [media] v4l2: bfin: Ensure delete and reinit list entry on NOMMU architecture On NOMMU architecture page fault is not triggered if a deleted list entry is accessed without reinit. Signed-off-by: Sonic Zhang Acked-by: Scott Jiang Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 7c70d510441..9b5daa65841 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -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);