From: Dan Carpenter <dan.carpenter@oracle.com>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] [media] mx3-camera: locking typo in mx3_videobuf_queue()
Date: Fri, 23 Aug 2013 12:45:30 +0300 [thread overview]
Message-ID: <20130823094530.GN31293@elgon.mountain> (raw)
There is a return in the middle where we haven't restored the IRQs to
their original state.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 1047e3e..4bae910 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -334,7 +334,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
if (!mx3_cam->active)
mx3_cam->active = buf;
- spin_unlock_irq(&mx3_cam->lock);
+ spin_unlock_irqrestore(&mx3_cam->lock, flags);
cookie = txd->tx_submit(txd);
dev_dbg(icd->parent, "Submitted cookie %d DMA 0x%08x\n",
@@ -343,7 +343,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
if (cookie >= 0)
return;
- spin_lock_irq(&mx3_cam->lock);
+ spin_lock_irqsave(&mx3_cam->lock, flags);
/* Submit error */
list_del_init(&buf->queue);
next reply other threads:[~2013-08-23 9:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-23 9:45 Dan Carpenter [this message]
2013-08-23 21:16 ` [patch] [media] mx3-camera: locking typo in mx3_videobuf_queue() Guennadi Liakhovetski
2013-08-24 7:06 ` Dan Carpenter
2013-08-28 7:50 ` Guennadi Liakhovetski
2013-08-29 8:23 ` [patch v2] [media] mx3-camera: locking cleanup " Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130823094530.GN31293@elgon.mountain \
--to=dan.carpenter@oracle.com \
--cc=g.liakhovetski@gmx.de \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox