diff --git a/gpio/src/vhu_gpio.rs b/gpio/src/vhu_gpio.rs
index ae09ef0..f9f206b 100644
--- a/gpio/src/vhu_gpio.rs
+++ b/gpio/src/vhu_gpio.rs
@@ -929,10 +929,13 @@ mod tests {
 
         backend.process_events(desc_chains.clone(), &vring).unwrap();
 
-        while backend.handles.read().unwrap()[GPIO as usize].is_some()
-            || backend.handles.read().unwrap()[(GPIO + 1) as usize].is_some()
-            || backend.handles.read().unwrap()[(GPIO + 2) as usize].is_some()
-        {}
+        while {
+            let h = backend.handles.read().unwrap();
+
+            h[GPIO as usize].is_some()
+                || h[(GPIO + 1) as usize].is_some()
+                || h[(GPIO + 2) as usize].is_some()
+        } {}
 
         validate_desc_chains(desc_chains, VIRTIO_GPIO_IRQ_STATUS_VALID, None);
     }
diff --git a/rust-vmm-ci b/rust-vmm-ci
index 99fe2eb..258161e 160000
--- a/rust-vmm-ci
+++ b/rust-vmm-ci
@@ -1 +1 @@
-Subproject commit 99fe2eb2e05d1b2cbeed6fb00b754e8f1c5b2f81
+Subproject commit 258161e88af86e1fb1fb188de25fd0e1f9d26d0a