aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tlclk.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-05-16 13:53:00 -0600
committerJonathan Corbet <corbet@lwn.net>2008-06-20 14:05:51 -0600
commitb8c71d7ae2a7f723d171d9175212b6d0a727655d (patch)
tree26bc87aac3c7f683dfe7c7aadf8ce112a9e48778 /drivers/char/tlclk.c
parentf4943db14f5071ecbf7ca76722e59a2fd22bda4d (diff)
downloadmrst-s0i3-test-b8c71d7ae2a7f723d171d9175212b6d0a727655d.tar.gz
mrst-s0i3-test-b8c71d7ae2a7f723d171d9175212b6d0a727655d.tar.xz
mrst-s0i3-test-b8c71d7ae2a7f723d171d9175212b6d0a727655d.zip
tlckl: BKL pushdown
Put explicit lock_kernel calls into tlclk_open() Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/char/tlclk.c')
-rw-r--r--drivers/char/tlclk.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 35e58030d29..8f2284be68e 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -36,6 +36,7 @@
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
#include <linux/timer.h>
#include <linux/sysfs.h>
#include <linux/device.h>
@@ -204,11 +205,14 @@ static int tlclk_open(struct inode *inode, struct file *filp)
{
int result;
- if (test_and_set_bit(0, &useflags))
- return -EBUSY;
+ lock_kernel();
+ if (test_and_set_bit(0, &useflags)) {
+ result = -EBUSY;
/* this legacy device is always one per system and it doesn't
* know how to handle multiple concurrent clients.
*/
+ goto out;
+ }
/* Make sure there is no interrupt pending while
* initialising interrupt handler */
@@ -218,13 +222,14 @@ static int tlclk_open(struct inode *inode, struct file *filp)
* we can't share this IRQ */
result = request_irq(telclk_interrupt, &tlclk_interrupt,
IRQF_DISABLED, "telco_clock", tlclk_interrupt);
- if (result == -EBUSY) {
+ if (result == -EBUSY)
printk(KERN_ERR "tlclk: Interrupt can't be reserved.\n");
- return -EBUSY;
- }
- inb(TLCLK_REG6); /* Clear interrupt events */
+ else
+ inb(TLCLK_REG6); /* Clear interrupt events */
- return 0;
+out:
+ unlock_kernel();
+ return result;
}
static int tlclk_release(struct inode *inode, struct file *filp)