Merge "msm: jpeg: Make _msm_jpeg_open and _msm_jpeg_release atomic" (96aa7a3c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -722,8 +722,6 @@ int __msm_jpeg_open(struct msm_jpeg_device *pgmn_dev)
		if (pgmn_dev->open_count == 1)
		pgmn_dev->state = MSM_JPEG_INIT;

		mutex_unlock(&pgmn_dev->lock);

		msm_jpeg_core_irq_install(msm_jpeg_irq);
		if (pgmn_dev->core_type == MSM_JPEG_CORE_CODEC)
		core_irq = msm_jpeg_core_irq;
		@@ -736,6 +734,7 @@ int __msm_jpeg_open(struct msm_jpeg_device *pgmn_dev)
		if (rc) {
		JPEG_PR_ERR("%s:%d] platform_init fail %d\n", __func__,
		__LINE__, rc);
		mutex_unlock(&pgmn_dev->lock);
		return rc;
		}

		@@ -753,6 +752,7 @@ int __msm_jpeg_open(struct msm_jpeg_device *pgmn_dev)
		msm_jpeg_core_init(pgmn_dev);

		JPEG_DBG("%s:%d] success\n", __func__, __LINE__);
		mutex_unlock(&pgmn_dev->lock);
		return rc;
		}

		@@ -766,7 +766,6 @@ int __msm_jpeg_release(struct msm_jpeg_device *pgmn_dev)
		return -EINVAL;
		}
		pgmn_dev->open_count--;
		mutex_unlock(&pgmn_dev->lock);

		msm_jpeg_core_release(pgmn_dev, pgmn_dev->domain_num);
		msm_jpeg_q_cleanup(&pgmn_dev->evt_q);
		@@ -785,6 +784,7 @@ int __msm_jpeg_release(struct msm_jpeg_device *pgmn_dev)
		pgmn_dev->irq, pgmn_dev);

		JPEG_DBG("%s:%d]\n", __func__, __LINE__);
		mutex_unlock(&pgmn_dev->lock);
		return 0;
		}