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

Commit cf97354e authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sync: Fix merge sync object issue" into dev/msm-4.9-camx

parents 4874a65b 9dbfd34a

drivers/media/platform/msm/camera/cam_sync/cam_sync.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -90,8 +90,9 @@ int cam_sync_register_callback(sync_callback cb_func, 
	}



	/* Trigger callback if sync object is already in SIGNALED state */

	if (row->state == CAM_SYNC_STATE_SIGNALED_SUCCESS ||

		row->state == CAM_SYNC_STATE_SIGNALED_ERROR) {

	if ((row->state == CAM_SYNC_STATE_SIGNALED_SUCCESS ||

		row->state == CAM_SYNC_STATE_SIGNALED_ERROR) &&

		(!row->remaining)) {

		sync_cb->callback_func = cb_func;

		sync_cb->cb_data = userdata;

		sync_cb->sync_obj = sync_obj;