diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-04-27 00:24:02 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-17 05:27:05 +0200 |
| commit | 703c631ebbcadcfd861d01e697fdda7c388fec9a (patch) | |
| tree | 7c93468e7c898f448a330ce266d6b9205238d64a /drivers/isdn/capi | |
| parent | f4927c45beda9a70e5c3bda0bd9f12b4f713c00b (diff) | |
| download | kernel_goldelico_gta04-703c631ebbcadcfd861d01e697fdda7c388fec9a.zip kernel_goldelico_gta04-703c631ebbcadcfd861d01e697fdda7c388fec9a.tar.gz kernel_goldelico_gta04-703c631ebbcadcfd861d01e697fdda7c388fec9a.tar.bz2 | |
isdn: Push down BKL into ioctl functions
Push down bkl into isdn ioctl functions
[fweisbec: dropped drivers/isdn/divert/divert_procfs.c
as it has been pushed down in procfs branch already]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'drivers/isdn/capi')
| -rw-r--r-- | drivers/isdn/capi/capi.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index ee58375..0cabe31 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -787,8 +787,7 @@ capi_poll(struct file *file, poll_table * wait) } static int -capi_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct capidev *cdev = file->private_data; capi_ioctl_struct data; @@ -981,6 +980,18 @@ register_out: } } +static long +capi_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + int ret; + + lock_kernel(); + ret = capi_ioctl(file, cmd, arg); + unlock_kernel(); + + return ret; +} + static int capi_open(struct inode *inode, struct file *file) { struct capidev *cdev; @@ -1026,7 +1037,7 @@ static const struct file_operations capi_fops = .read = capi_read, .write = capi_write, .poll = capi_poll, - .ioctl = capi_ioctl, + .unlocked_ioctl = capi_unlocked_ioctl, .open = capi_open, .release = capi_release, }; |