[media] omap3isp: Move buffer irqlist to isp_buffer structure

[sfrench/cifs-2.6.git] / drivers / media / platform / omap3isp / ispvideo.h

diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/platform/omap3isp/ispvideo.h
index 4e194076cc60d611727a6441231f79006dbfadfc..1e3d17a70df25c0410631cb637122ba6824c1de8 100644 (file)
--- a/drivers/media/platform/omap3isp/ispvideo.h
+++ b/drivers/media/platform/omap3isp/ispvideo.h
@@ -127,10 +127,12 @@ static inline int isp_pipeline_ready(struct isp_pipeline *pipe)
 /*
  * struct isp_buffer - ISP buffer
  * @buffer: ISP video buffer
+ * @irqlist: List head for insertion into IRQ queue
  * @isp_addr: MMU mapped address (a.k.a. device address) of the buffer.
  */
 struct isp_buffer {
        struct isp_video_buffer buffer;
+       struct list_head irqlist;
        dma_addr_t isp_addr;
 };
 
@@ -182,6 +184,8 @@ struct isp_video {
 
        /* Video buffers queue */
        struct isp_video_queue *queue;
+       struct mutex queue_lock;        /* protects the queue */
+       spinlock_t irqlock;             /* protects dmaqueue */
        struct list_head dmaqueue;
        enum isp_video_dmaqueue_flags dmaqueue_flags;