>From 999595f4c79b88ecae7781f8907321d7a33f36b0 Mon Sep 17 00:00:00 2001 From: Vinod Koul <[email protected]> Date: Wed, 17 Nov 2010 22:20:08 +0530 Subject: [PATCH 4/4] sst: make ioctls unlocked
This patch makes ioctl as unlocked_ioctl Signed-off-by: Vinod Koul <[email protected]> --- sound/pci/sst/intel_sst.c | 4 ++-- sound/pci/sst/intel_sst_app_interface.c | 3 +-- sound/pci/sst/intel_sst_common.h | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/pci/sst/intel_sst.c b/sound/pci/sst/intel_sst.c index c58fcfe..6cb4fd6 100644 --- a/sound/pci/sst/intel_sst.c +++ b/sound/pci/sst/intel_sst.c @@ -61,7 +61,7 @@ static const struct file_operations intel_sst_fops = { .release = intel_sst_release, .read = intel_sst_read, .write = intel_sst_write, - .ioctl = intel_sst_ioctl, + .unlocked_ioctl = intel_sst_ioctl, .mmap = intel_sst_mmap, .aio_read = intel_sst_aio_read, .aio_write = intel_sst_aio_write, @@ -70,7 +70,7 @@ static const struct file_operations intel_sst_fops_cntrl = { .owner = THIS_MODULE, .open = intel_sst_open_cntrl, .release = intel_sst_release_cntrl, - .ioctl = intel_sst_ioctl, + .unlocked_ioctl = intel_sst_ioctl, }; static struct miscdevice lpe_dev = { diff --git a/sound/pci/sst/intel_sst_app_interface.c b/sound/pci/sst/intel_sst_app_interface.c index 1f584ed..cd78d72 100644 --- a/sound/pci/sst/intel_sst_app_interface.c +++ b/sound/pci/sst/intel_sst_app_interface.c @@ -959,8 +959,7 @@ free_mem: * This function is called by OS when a user space component * sends an Ioctl to SST driver */ -int intel_sst_ioctl(struct inode *i_node, struct file *file_ptr, - unsigned int cmd, unsigned long arg) +long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) { int retval = 0; struct ioctl_pvt_data *data = NULL; diff --git a/sound/pci/sst/intel_sst_common.h b/sound/pci/sst/intel_sst_common.h index 39837b3..30fccab 100644 --- a/sound/pci/sst/intel_sst_common.h +++ b/sound/pci/sst/intel_sst_common.h @@ -474,8 +474,8 @@ void sst_process_reply(struct work_struct *work); void sst_process_mad_ops(struct work_struct *work); void sst_process_mad_jack_detection(struct work_struct *work); -int intel_sst_ioctl(struct inode *i_node, struct file *file_ptr, - unsigned int cmd, unsigned long arg); +long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, + unsigned long arg); int intel_sst_open(struct inode *i_node, struct file *file_ptr); int intel_sst_open_cntrl(struct inode *i_node, struct file *file_ptr); int intel_sst_release(struct inode *i_node, struct file *file_ptr); -- 1.7.2.3
0004-sst-make-ioctls-unlocked.patch
Description: 0004-sst-make-ioctls-unlocked.patch
_______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
