1
0
Fork 0

mxc_epdc_fb: fix inverted conditional leading to endless collisions

pull/1/head
Martin T. H. Sandsmark 2017-05-18 09:49:05 +02:00
parent 38dfa33101
commit 68595af21c
1 changed files with 1 additions and 1 deletions

View File

@ -2412,7 +2412,7 @@ static int epdc_submit_merge(struct update_desc_list *upd_desc_list,
/* Merged update should take on the earliest order */
upd_desc_list->update_order =
(upd_desc_list->update_order > update_to_merge->update_order) ?
upd_desc_list->update_order : update_to_merge->update_order;
update_to_merge->update_order : update_desc_list->update_order;
return MERGE_OK;
}