leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

snsc: cdev lock_kernel() pushdown

Browse Source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 16:44:14 -06:00
parent 78a3c3d7c6
commit c43ef17450
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/snsc.c
View File

@ -21,6 +21,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h>
#include <asm/sn/io.h> #include <asm/sn/io.h>
#include <asm/sn/sn_sal.h> #include <asm/sn/sn_sal.h>
#include <asm/sn/module.h> #include <asm/sn/module.h>
@ -104,6 +105,7 @@ scdrv_open(struct inode *inode, struct file *file)
file->private_data = sd; file->private_data = sd;
/* hook this subchannel up to the system controller interrupt */ /* hook this subchannel up to the system controller interrupt */
lock_kernel();
rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt, rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
IRQF_SHARED | IRQF_DISABLED, IRQF_SHARED | IRQF_DISABLED,
SYSCTL_BASENAME, sd); 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); ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
kfree(sd); kfree(sd);
printk("%s: irq request failed (%d)\n", __func__, rv); printk("%s: irq request failed (%d)\n", __func__, rv);
unlock_kernel();
return -EBUSY; return -EBUSY;
} }
unlock_kernel();
return 0; return 0;
} }