diff --git a/drivers/storage/bcm2835-sdhcid/src/main.rs b/drivers/storage/bcm2835-sdhcid/src/main.rs
index 2241d27c01..b8ab27553e 100644
--- a/drivers/storage/bcm2835-sdhcid/src/main.rs
+++ b/drivers/storage/bcm2835-sdhcid/src/main.rs
@@ -26,6 +26,7 @@ fn main() {
 }
 
 fn daemon(daemon: daemon::Daemon) -> ! {
+    common::init();
     let dtb_data = get_dtb();
     println!("read from OS, len = {}", dtb_data.len());
     if dtb_data.len() == 0 {
diff --git a/randd/src/main.rs b/randd/src/main.rs
index 5cae0e2522..a77057a379 100644
--- a/randd/src/main.rs
+++ b/randd/src/main.rs
@@ -58,11 +58,12 @@ fn create_rdrand_seed() -> [u8; SEED_BYTES] {
     {
         fn is_cpu_feature_detected(feature: &str) -> bool {
             if let Ok(cpu) = std::fs::read_to_string("/scheme/sys/cpu") {
-                return cpu
+                let found = cpu
                     .lines()
                     .find_map(|s| s.strip_prefix("Features:"))
-                    .map(|s| s.split(" ").find(|s| s == &feature))
+                    .and_then(|s| s.split(" ").find(|s| s == &feature))
                     .is_some();
+                return found;
             }
             false
         }