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

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

drivers/staging/intel_sst/intel_sst_app_interface.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

}