Snap for 11526323 from eaa5a3fa8709d40d68943d6f829f814d95c028ff to simpleperf-releasesimpleperf-release

Change-Id: I33e34c154d9e8fd4c48f96c4249ca75052e4651f

1 files changed, 6 insertions, 2 deletions

diff --git a/devices/src/virtio/console.rs b/devices/src/virtio/console.rs
index ba0e1c367..e4d870a73 100644
--- a/devices/src/virtio/console.rs
+++ b/devices/src/virtio/console.rs
@@ -387,7 +387,9 @@ impl VirtioDevice for Console {
     }
 
     fn reset(&mut self) -> bool {
-        self.input = self.input_thread.take().map(|t| t.stop());
+        if let Some(input_thread) = self.input_thread.take() {
+            self.input = Some(input_thread.stop());
+        }
         if let Some(worker_thread) = self.worker_thread.take() {
             let worker = worker_thread.stop();
             // NOTE: Even though we are reseting the device, it still makes sense to preserve the
@@ -402,7 +404,9 @@ impl VirtioDevice for Console {
     }
 
     fn virtio_sleep(&mut self) -> anyhow::Result<Option<BTreeMap<usize, Queue>>> {
-        self.input = self.input_thread.take().map(|t| t.stop());
+        if let Some(input_thread) = self.input_thread.take() {
+            self.input = Some(input_thread.stop());
+        }
         if let Some(worker_thread) = self.worker_thread.take() {
             let worker = worker_thread.stop();
             self.input_buffer = worker