[1/3] lirc_dev: stray unlock in lirc_dev_fop_poll()

Message ID 20101117051223.GD31724@bicker (mailing list archive)
State Superseded, archived
Headers

Commit Message

Dan Carpenter Nov. 17, 2010, 5:12 a.m. UTC
  We shouldn't unlock here.  I think this was a cut and paste error.

Signed-off-by: Dan Carpenter <error27@gmail.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Comments

Jarod Wilson Nov. 17, 2010, 8:21 p.m. UTC | #1
On Wed, Nov 17, 2010 at 08:12:23AM +0300, Dan Carpenter wrote:
> We shouldn't unlock here.  I think this was a cut and paste error.

Yeah, looks like it.

Acked-by: Jarod Wilson <jarod@redhat.com>
  

Patch

diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/IR/lirc_dev.c
index 8418b14..8ab9d87 100644
--- a/drivers/media/IR/lirc_dev.c
+++ b/drivers/media/IR/lirc_dev.c
@@ -522,10 +522,8 @@  unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
 
 	dev_dbg(ir->d.dev, LOGHEAD "poll called\n", ir->d.name, ir->d.minor);
 
-	if (!ir->attached) {
-		mutex_unlock(&ir->irctl_lock);
+	if (!ir->attached)
 		return POLLERR;
-	}
 
 	poll_wait(file, &ir->buf->wait_poll, wait);