diff --git a/devices/src/virtio/vhost/user/device/gpu.rs b/devices/src/virtio/vhost/user/device/gpu.rs
index aacbc874ed..32520bb413 100644
--- a/devices/src/virtio/vhost/user/device/gpu.rs
+++ b/devices/src/virtio/vhost/user/device/gpu.rs
@@ -86,11 +86,9 @@ async fn run_ctrl_queue(
                     }
                 }
             }
-        } else {
-            if let Err(e) = kick_evt.next_val().await {
-                error!("Failed to read kick event for ctrl queue: {}", e);
-                break;
-            }
+        } else if let Err(e) = kick_evt.next_val().await {
+            error!("Failed to read kick event for ctrl queue: {}", e);
+            break;
         }
 
         let mut state = state.borrow_mut();
@@ -260,9 +258,8 @@ impl VhostUserBackend for GpuBackend {
         let kick_evt =
             EventAsync::new(kick_evt.0, ex).context("failed to create EventAsync for kick_evt")?;
 
-        let queue = Arc::new(Mutex::new(queue));
         let reader = SharedReader {
-            queue: queue.clone(),
+            queue: Arc::new(Mutex::new(queue)),
             call_evt,
         };
 
@@ -464,7 +461,6 @@ pub fn run_gpu_device(program_name: &str, args: std::env::Args) -> anyhow::Resul
                     path.display(),
                     e
                 );
-                return;
             }
         })
         .detach();
diff --git a/third_party/vmm_vhost b/third_party/vmm_vhost
index 02f8b005f5..d65bd280d9 160000
--- a/third_party/vmm_vhost
+++ b/third_party/vmm_vhost
@@ -1 +1 @@
-Subproject commit 02f8b005f568d7d959e1d977c36cbcf635f97043
+Subproject commit d65bd280d9f4e192a884f1761e4b097c11aae6de