Merge "crypto: msm: change clock operation in qcedev driver" (c27b4e1a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/crypto/msm/qcedev.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -259,8 +259,6 @@ static int qcedev_open(struct inode inode, struct file file)

		handle->cntl = podev;
		file->private_data = handle;
		if (podev->platform_support.bus_scale_table != NULL)
		qcedev_ce_high_bw_req(podev, true);

		mutex_init(&handle->registeredbufs.lock);
		INIT_LIST_HEAD(&handle->registeredbufs.list);
		@@ -284,8 +282,6 @@ static int qcedev_release(struct inode inode, struct file file)

		kzfree(handle);
		file->private_data = NULL;
		if (podev != NULL && podev->platform_support.bus_scale_table != NULL)
		qcedev_ce_high_bw_req(podev, false);
		return 0;
		}

		@@ -1711,6 +1707,11 @@ static inline long qcedev_ioctl(struct file *file,
		init_completion(&qcedev_areq->complete);
		pstat = &_qcedev_stat;

		if (podev->platform_support.bus_scale_table != NULL &&
		cmd != QCEDEV_IOCTL_MAP_BUF_REQ &&
		cmd != QCEDEV_IOCTL_UNMAP_BUF_REQ)
		qcedev_ce_high_bw_req(podev, true);

		switch (cmd) {
		case QCEDEV_IOCTL_ENC_REQ:
		case QCEDEV_IOCTL_DEC_REQ:
		@@ -1996,6 +1997,10 @@ static inline long qcedev_ioctl(struct file *file,
		}

		exit_free_qcedev_areq:
		if (podev->platform_support.bus_scale_table != NULL &&
		cmd != QCEDEV_IOCTL_MAP_BUF_REQ &&
		cmd != QCEDEV_IOCTL_UNMAP_BUF_REQ)
		qcedev_ce_high_bw_req(podev, false);
		kfree(qcedev_areq);
		return err;
		}