Test for retry of driver detach and interface claim

rog-core/src/rogcore.rs

@@ -65,32 +65,36 @@ impl RogCore {
             }
         }
 
+        if let Err(err) = dev_handle.set_auto_detach_kernel_driver(true) {
+            warn!("Auto-detach kernel driver failed: {:?}", err);
+            let mut fail_count = 10;
+            while fail_count > 0 {
+                warn!("Trying device reset");
+                fail_count -= 1;
+                dev_handle.reset()?;
+                std::thread::sleep(std::time::Duration::from_millis(500));
                 dev_handle
                     .set_auto_detach_kernel_driver(true)
                     .map_err(|err| {
                         error!("Auto-detach kernel driver failed: {:?}", err);
                         err
                     })?;
+            }
+        }
 
         if let Err(err) = dev_handle.claim_interface(interface) {
             warn!("Could not claim keyboard device interface: {:?}", err);
-            warn!("Trying to detach kernel driver then retry");
+            let mut fail_count = 10;
-            if let Ok(active) = dev_handle.kernel_driver_active(interface) {
+            while fail_count > 0 {
-                if active {
+                warn!("Sleeping");
-                    dev_handle.reset()?;
+                fail_count -= 1;
-                    dev_handle.detach_kernel_driver(interface).map_err(|err| {
+                std::thread::sleep(std::time::Duration::from_millis(500));
-                        warn!("Could not detach kernel driver: {:?}", err);
-                        err
-                    })?;
-                } else {
-                    warn!("Kernel driver not active, continue");
-                }
-            }
                 dev_handle.claim_interface(interface).map_err(|err| {
                     error!("Could not claim keyboard device interface: {:?}", err);
                     err
                 })?;
             }
+        }
 
         Ok(RogCore {
             handle: dev_handle,