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

staging: sst: remove the kernel locking in ioctl

Browse source 
kernel locking in ioctl was introduced when ioctl function was
moved from ioctl to unlocked ioctl
This is no longer required hence removed

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Vinod Koul 2010-10-14 16:59:38 +01:00 committed by Greg Kroah-Hartman
parent 6e2c2dcfa4
commit 88eea8de94
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/intel_sst/intel_sst_app_interface.c
View file

@ -812,8 +812,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
struct ioctl_pvt_data *data = NULL;
int str_id = 0, minor = 0;
lock_kernel();
data = file_ptr->private_data;
if (data) {
minor = 0;
@ -821,10 +819,8 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
} else
minor = 1;
if (sst_drv_ctx->sst_state != SST_FW_RUNNING) {
unlock_kernel();
if (sst_drv_ctx->sst_state != SST_FW_RUNNING)
return -EBUSY;
}
switch (_IOC_NR(cmd)) {
case _IOC_NR(SNDRV_SST_STREAM_PAUSE):
@ -1227,7 +1223,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
default:
retval = -EINVAL;
}
unlock_kernel();
pr_debug("sst: intel_sst_ioctl:complete ret code = %d\n", retval);
return retval;
}