redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

sh: cdev lock_kernel() pushdown

Browse source 
Push the cdev lock_kernel() call down into the sh gio driver.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 09:11:26 -06:00
parent 7558da942e
commit 1fa984b583
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/sh/boards/landisk/gio.c
View file

@ -14,6 +14,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -32,17 +33,20 @@ static int openCnt;
static int gio_open(struct inode *inode, struct file *filp) static int gio_open(struct inode *inode, struct file *filp)
{ {
int minor; int minor;
int ret = -ENOENT;
lock_kernel();
minor = MINOR(inode->i_rdev); minor = MINOR(inode->i_rdev);
if (minor < DEVCOUNT) { if (minor < DEVCOUNT) {
if (openCnt > 0) { if (openCnt > 0) {
return -EALREADY; ret = -EALREADY;
} else { } else {
openCnt++; openCnt++;
return 0; ret = 0;
} }
} }
return -ENOENT; unlock_kernel();
return ret;
} }
static int gio_close(struct inode *inode, struct file *filp) static int gio_close(struct inode *inode, struct file *filp)