diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-05-15 16:44:14 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 14:05:50 -0600 |
| commit | c43ef17450dce8cbf50f97497a1949ff8f484e88 (patch) | |
| tree | aac874601a18585a501496faea51ede3acc822f3 /drivers | |
| parent | 78a3c3d7c6b89085610edfe86f7790144afc737e (diff) | |
| download | linux-c43ef17450dce8cbf50f97497a1949ff8f484e88.tar.gz linux-c43ef17450dce8cbf50f97497a1949ff8f484e88.tar.bz2 linux-c43ef17450dce8cbf50f97497a1949ff8f484e88.zip | |
snsc: cdev lock_kernel() pushdown
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/snsc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index 8fe099a41065..0b799ac1b049 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -21,6 +21,7 @@ #include <linux/poll.h> #include <linux/module.h> #include <linux/slab.h> +#include <linux/smp_lock.h> #include <asm/sn/io.h> #include <asm/sn/sn_sal.h> #include <asm/sn/module.h> @@ -104,6 +105,7 @@ scdrv_open(struct inode *inode, struct file *file) file->private_data = sd; /* hook this subchannel up to the system controller interrupt */ + lock_kernel(); rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt, IRQF_SHARED | IRQF_DISABLED, SYSCTL_BASENAME, sd); @@ -111,9 +113,10 @@ scdrv_open(struct inode *inode, struct file *file) ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch); kfree(sd); printk("%s: irq request failed (%d)\n", __func__, rv); + unlock_kernel(); return -EBUSY; } - + unlock_kernel(); return 0; } |