From c007dd9259b0b15a67cf4fd9acb4c3e87143c635 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 17 Nov 2010 02:12:23 -0300
Subject: [PATCH] --- yaml --- r: 223569 b: refs/heads/master c:
 5c769a68beaee924e1dc90bf06e1b087b1d46237 h: refs/heads/master i:   223567:
 ed15cb61d0dd68f01c7cb7b08b7067fa8e826ecc v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/media/IR/lirc_dev.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6a462f431eb4..bd4845c698fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 635f76b2aa8ef3e8436dedddc8baa6f7f438dc40
+refs/heads/master: 5c769a68beaee924e1dc90bf06e1b087b1d46237
diff --git a/trunk/drivers/media/IR/lirc_dev.c b/trunk/drivers/media/IR/lirc_dev.c
index 8418b14ee4d2..8ab9d87f3a46 100644
--- a/trunk/drivers/media/IR/lirc_dev.c
+++ b/trunk/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);