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

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

Merge "msm: vidc: enable port reconfig for thumbnail session"

parents ef0769db 6d5592aa

drivers/media/platform/msm/vidc/msm_vidc_common.c

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

/* Copyright (c) 2012-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
@@ -1135,8 +1135,7 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 
	case HAL_EVENT_SEQ_CHANGED_SUFFICIENT_RESOURCES:

		rc = msm_comm_g_ctrl_for_id(inst,

			V4L2_CID_MPEG_VIDC_VIDEO_CONTINUE_DATA_TRANSFER);

		if (!is_thumbnail_session(inst) &&

			(IS_ERR_VALUE(rc) || rc == false))

		if ((IS_ERR_VALUE(rc) || rc == false))

			event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

		else

			event = V4L2_EVENT_SEQ_CHANGED_SUFFICIENT;