Merge "msm: jpeg: fix core reset on invalid state" (56695d3e) · Commits · e / devices / android_kernel_sony_msm8994

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

+4 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -719,6 +719,9 @@ int __msm_jpeg_open(struct msm_jpeg_device *pgmn_dev)
		return -EBUSY;
		}
		pgmn_dev->open_count++;
		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);