Commit a7a69197 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] mx3-camera: locking cleanup in mx3_videobuf_queue() 



Smatch complains about the locking here because we mix spin_lock_irq()
with spin_lock_irqsave() in an unusual way.  According to Smatch, it's
not always clear if the IRQs are enabled or disabled when we return.  It
turns out this function is always called with IRQs enabled and we can
just use spin_lock_irq().
It's called from __enqueue_in_driver().

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 47c32ec9

drivers/media/platform/soc_camera/mx3_camera.c

+2 −3
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) 
	struct idmac_channel *ichan = mx3_cam->idmac_channel[0];

	struct idmac_video_param *video = &ichan->params.video;

	const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt;

	unsigned long flags;

	dma_cookie_t cookie;

	size_t new_size;
@@ -328,7 +327,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) 
		memset(vb2_plane_vaddr(vb, 0), 0xaa, vb2_get_plane_payload(vb, 0));

#endif



	spin_lock_irqsave(&mx3_cam->lock, flags);

	spin_lock_irq(&mx3_cam->lock);

	list_add_tail(&buf->queue, &mx3_cam->capture);



	if (!mx3_cam->active)
@@ -351,7 +350,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) 
	if (mx3_cam->active == buf)

		mx3_cam->active = NULL;



	spin_unlock_irqrestore(&mx3_cam->lock, flags);

	spin_unlock_irq(&mx3_cam->lock);

error:

	vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE