From ee347ac9cc4bd40d54f2a9937733713d6493b677 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Mon, 9 Mar 2015 11:56:53 +0530 Subject: OCC: Do not call occ_do_load if hostservice LID load is not complete Commit 4db0c1e4f introduced occ_load_req queue. With that changes we queue the occ load request if hostservice LID load is not complete. And we have callback function (occ_poke_load_queue)...which takes care of calling __occ_do_load(). But current code proceeds and calls __occ_do_load() after queueing....which is not correct. So just return if we queue the occ load request. Signed-off-by: Vasant Hegde cc: Ananth N Mavinakayanahalli Reviewed-by: Vaidyanathan Srinivasan Acked-by: Ananth N Mavinakayanahalli Signed-off-by: Stewart Smith --- hw/occ.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/occ.c b/hw/occ.c index 657f2ad3..bd8fbd00 100644 --- a/hw/occ.c +++ b/hw/occ.c @@ -456,8 +456,10 @@ static void occ_do_load(u8 scope, u32 dbob_id __unused, u32 seq_id) * Check if hostservices lid caching is complete. If not, queue * the load request. */ - if (!hservices_lid_preload_complete()) + if (!hservices_lid_preload_complete()) { occ_queue_load(scope, dbob_id, seq_id); + return; + } __occ_do_load(scope, dbob_id, seq_id); } -- cgit v1.2.1