|
@@ -690,14 +690,14 @@ static int32_t __cam_req_mgr_find_slot_for_req(
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * __cam_req_mgr_disconnect_flushed_req_on_sync_link()
|
|
|
|
|
|
+ * __cam_req_mgr_disconnect_req_on_sync_link()
|
|
*
|
|
*
|
|
* @brief : Disconnect link and sync link
|
|
* @brief : Disconnect link and sync link
|
|
* @link : pointer to link
|
|
* @link : pointer to link
|
|
* @slot : poniter to slot
|
|
* @slot : poniter to slot
|
|
*
|
|
*
|
|
*/
|
|
*/
|
|
-static void __cam_req_mgr_disconnect_flushed_req_on_sync_link(
|
|
|
|
|
|
+static void __cam_req_mgr_disconnect_req_on_sync_link(
|
|
struct cam_req_mgr_core_link *link,
|
|
struct cam_req_mgr_core_link *link,
|
|
struct cam_req_mgr_slot *slot)
|
|
struct cam_req_mgr_slot *slot)
|
|
{
|
|
{
|
|
@@ -760,7 +760,7 @@ static void __cam_req_mgr_flush_req_slot(
|
|
idx, slot->req_id, slot->status);
|
|
idx, slot->req_id, slot->status);
|
|
|
|
|
|
if ((slot->req_id > 0) && slot->num_sync_links)
|
|
if ((slot->req_id > 0) && slot->num_sync_links)
|
|
- __cam_req_mgr_disconnect_flushed_req_on_sync_link(link, slot);
|
|
|
|
|
|
+ __cam_req_mgr_disconnect_req_on_sync_link(link, slot);
|
|
|
|
|
|
/* Reset input queue slot */
|
|
/* Reset input queue slot */
|
|
slot->req_id = -1;
|
|
slot->req_id = -1;
|
|
@@ -821,6 +821,9 @@ static void __cam_req_mgr_reset_req_slot(struct cam_req_mgr_core_link *link,
|
|
idx < 0)
|
|
idx < 0)
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
+ if ((slot->req_id > 0) && slot->num_sync_links)
|
|
|
|
+ __cam_req_mgr_disconnect_req_on_sync_link(link, slot);
|
|
|
|
+
|
|
/* Reset input queue slot */
|
|
/* Reset input queue slot */
|
|
slot->req_id = -1;
|
|
slot->req_id = -1;
|
|
slot->skip_idx = 0;
|
|
slot->skip_idx = 0;
|
|
@@ -2838,7 +2841,7 @@ static int __cam_req_mgr_try_cancel_req(struct cam_req_mgr_core_link *link,
|
|
|
|
|
|
slot = &in_q->slot[idx];
|
|
slot = &in_q->slot[idx];
|
|
if ((slot->req_id > 0) && slot->num_sync_links)
|
|
if ((slot->req_id > 0) && slot->num_sync_links)
|
|
- __cam_req_mgr_disconnect_flushed_req_on_sync_link(link, slot);
|
|
|
|
|
|
+ __cam_req_mgr_disconnect_req_on_sync_link(link, slot);
|
|
|
|
|
|
switch (slot->status) {
|
|
switch (slot->status) {
|
|
case CRM_SLOT_STATUS_REQ_PENDING:
|
|
case CRM_SLOT_STATUS_REQ_PENDING:
|