From 14421571ca39459e96bc97e53694a4592a3be384 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 17 Nov 2016 15:10:34 -0800 Subject: [PATCH] g: fix reboot request posting bug When the host requests the uploader to post a reboot request, the uploader should exit right away once the request is posted. BRANCH=none BUG=chrome-os-partner:59911 TEST=verified that cr50 gets successfully updated from this image to a newer one on both reef and gru: the reboot happens under upstart control, not by cr50 rebooting on its own. Change-Id: I9e4a2da686fe512b633daa05c675871e5946926f Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/412348 Reviewed-by: Bill Richardson Reviewed-by: Mary Ruthven --- chip/g/usb_upgrade.c | 1 + 1 file changed, 1 insertion(+) diff --git a/chip/g/usb_upgrade.c b/chip/g/usb_upgrade.c index 1e1fb82957..3800c529c5 100644 --- a/chip/g/usb_upgrade.c +++ b/chip/g/usb_upgrade.c @@ -188,6 +188,7 @@ static void upgrade_out_handler(struct consumer const *consumer, size_t count) */ rx_state_ = rx_idle; post_reboot_request(); + return; } if (rx_state_ == rx_outside_block) {