lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsp56k: BKL pushdown

Browse Source 
Put explicit lock_kernel calls into dsp56k_open().

[Stupid missing label error fixed]

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-16 13:57:31 -06:00
parent c0bed680f0
commit 65f37b790b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/char/dsp56k.c
View File

@@ -33,6 +33,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/smp_lock.h>
#include <asm/atarihw.h> #include <asm/atarihw.h>
#include <asm/traps.h> #include <asm/traps.h>
@@ -436,13 +437,17 @@ static unsigned int dsp56k_poll(struct file *file, poll_table *wait)
static int dsp56k_open(struct inode *inode, struct file *file) static int dsp56k_open(struct inode *inode, struct file *file)
{ {
int dev = iminor(inode) & 0x0f; int dev = iminor(inode) & 0x0f;
int ret = 0;
lock_kernel();
switch(dev) switch(dev)
{ {
case DSP56K_DEV_56001: case DSP56K_DEV_56001:
if (test_and_set_bit(0, &dsp56k.in_use)) if (test_and_set_bit(0, &dsp56k.in_use)) {
return -EBUSY; ret = -EBUSY;
goto out;
}
dsp56k.timeout = TIMEOUT; dsp56k.timeout = TIMEOUT;
dsp56k.maxio = MAXIO; dsp56k.maxio = MAXIO;
@@ -458,10 +463,11 @@ static int dsp56k_open(struct inode *inode, struct file *file)
break; break;
default: default:
return -ENODEV; ret = -ENODEV;
} }
out:
return 0; unlock_kernel();
return ret;
} }
static int dsp56k_release(struct inode *inode, struct file *file) static int dsp56k_release(struct inode *inode, struct file *file)