adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 20:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

i2c: cdev lock_kernel() pushdown

Browse source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 09:21:02 -06:00
parent 5119e92efc
commit 3db633ee35
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/i2c/i2c-dev.c
View file

@ -34,6 +34,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-dev.h> #include <linux/i2c-dev.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
static struct i2c_driver i2cdev_driver; static struct i2c_driver i2cdev_driver;
@ -441,14 +442,20 @@ static int i2cdev_open(struct inode *inode, struct file *file)
struct i2c_client *client; struct i2c_client *client;
struct i2c_adapter *adap; struct i2c_adapter *adap;
struct i2c_dev *i2c_dev; struct i2c_dev *i2c_dev;
int ret = 0;
lock_kernel();
i2c_dev = i2c_dev_get_by_minor(minor); i2c_dev = i2c_dev_get_by_minor(minor);
if (!i2c_dev) if (!i2c_dev) {
return -ENODEV; ret = -ENODEV;
goto out;
}
adap = i2c_get_adapter(i2c_dev->adap->nr); adap = i2c_get_adapter(i2c_dev->adap->nr);
if (!adap) if (!adap) {
return -ENODEV; ret = -ENODEV;
goto out;
}
/* This creates an anonymous i2c_client, which may later be /* This creates an anonymous i2c_client, which may later be
* pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE. * pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE.
@ -460,7 +467,8 @@ static int i2cdev_open(struct inode *inode, struct file *file)
client = kzalloc(sizeof(*client), GFP_KERNEL); client = kzalloc(sizeof(*client), GFP_KERNEL);
if (!client) { if (!client) {
i2c_put_adapter(adap); i2c_put_adapter(adap);
return -ENOMEM; ret = -ENOMEM;
goto out;
} }
snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr); snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr);
client->driver = &i2cdev_driver; client->driver = &i2cdev_driver;
@ -468,7 +476,9 @@ static int i2cdev_open(struct inode *inode, struct file *file)
client->adapter = adap; client->adapter = adap;
file->private_data = client; file->private_data = client;
return 0; out:
unlock_kernel();
return ret;
} }
static int i2cdev_release(struct inode *inode, struct file *file) static int i2cdev_release(struct inode *inode, struct file *file)