Commit 88eea8de authored by Vinod Koul's avatar Vinod Koul Committed by Greg Kroah-Hartman

staging: sst: remove the kernel locking in ioctl

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: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6e2c2dcf
...@@ -812,8 +812,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) ...@@ -812,8 +812,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
struct ioctl_pvt_data *data = NULL; struct ioctl_pvt_data *data = NULL;
int str_id = 0, minor = 0; int str_id = 0, minor = 0;
lock_kernel();
data = file_ptr->private_data; data = file_ptr->private_data;
if (data) { if (data) {
minor = 0; minor = 0;
...@@ -821,10 +819,8 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) ...@@ -821,10 +819,8 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
} else } else
minor = 1; minor = 1;
if (sst_drv_ctx->sst_state != SST_FW_RUNNING) { if (sst_drv_ctx->sst_state != SST_FW_RUNNING)
unlock_kernel();
return -EBUSY; return -EBUSY;
}
switch (_IOC_NR(cmd)) { switch (_IOC_NR(cmd)) {
case _IOC_NR(SNDRV_SST_STREAM_PAUSE): 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) ...@@ -1227,7 +1223,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
default: default:
retval = -EINVAL; retval = -EINVAL;
} }
unlock_kernel();
pr_debug("sst: intel_sst_ioctl:complete ret code = %d\n", retval); pr_debug("sst: intel_sst_ioctl:complete ret code = %d\n", retval);
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment