summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-06-22 18:42:10 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-02 16:40:55 -0700
commitde04a674cce8637098466b7487e79eebf69fd991 (patch)
tree03afabcb32ab474d510ba2fac8f8b2718ec26a6d
parentd58c84b663ef7991ca6e06de059d097b68510507 (diff)
downloadlwn-de04a674cce8637098466b7487e79eebf69fd991.tar.gz
lwn-de04a674cce8637098466b7487e79eebf69fd991.zip
pcmcia/cm4000: fix lock imbalance
commit 69ae59d7d8df14413cf0a97b3e372d7dc8352563 upstream. Don't return from switch/case, break instead, so that we unlock BKL. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index dbb912574569..881934c068c8 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1575,7 +1575,8 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
clear_bit(LOCK_IO, &dev->flags);
wake_up_interruptible(&dev->ioq);
- return 0;
+ rc = 0;
+ break;
case CM_IOCSPTS:
{
struct ptsreq krnptsreq;