Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91ae4969 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "camera_v2: jpeg_10: Set state before hw start"

parents ed05322b bfd1c27c
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
/* Copyright (c) 2012-2014, 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
@@ -765,11 +765,12 @@ int msm_jpeg_start(struct msm_jpeg_device *pgmn_dev, void * __user arg)
	for (i = 0; i < 2; i++)
		kfree(buf_out_free[i]);

	pgmn_dev->state = MSM_JPEG_EXECUTING;
	JPEG_DBG_HIGH("%s:%d] START\n", __func__, __LINE__);
	wmb();
	rc = msm_jpeg_ioctl_hw_cmds(pgmn_dev, arg);
	wmb();
	pgmn_dev->state = MSM_JPEG_EXECUTING;

	JPEG_DBG("%s:%d]", __func__, __LINE__);
	return rc;
}