summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-11-17 02:12:23 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-20 14:11:14 -0200
commit5c769a68beaee924e1dc90bf06e1b087b1d46237 (patch)
treec2e030ef725865d828d2248a3034579a77bff9ec
parent635f76b2aa8ef3e8436dedddc8baa6f7f438dc40 (diff)
downloadlinux-5c769a68beaee924e1dc90bf06e1b087b1d46237.tar.gz
linux-5c769a68beaee924e1dc90bf06e1b087b1d46237.tar.bz2
linux-5c769a68beaee924e1dc90bf06e1b087b1d46237.zip
[media] lirc_dev: stray unlock in lirc_dev_fop_poll()
We shouldn't unlock here. I think this was a cut and paste error. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/IR/lirc_dev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/IR/lirc_dev.c
index 8418b14ee4d2..8ab9d87f3a46 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);