1 files changed, 19 insertions, 10 deletions

diff --git a/firmware/drivers/tuner/si4700.c b/firmware/drivers/tuner/si4700.c
index 985659b77b..8e43fe6acc 100644
--- a/firmware/drivers/tuner/si4700.c
+++ b/firmware/drivers/tuner/si4700.c
@@ -316,30 +316,39 @@ static void si4700_sleep(int snooze)
     }
 }
 
-void si4700_init(void)
+bool si4700_detect(void)
 {
+    bool detected;
+
     tuner_power(true);
+    detected = (si4700_read_reg(DEVICEID) == 0x1242);
+    tuner_power(false);
 
-    /* read all registers */
-    si4700_read(16);
-    si4700_sleep(0);
+    return detected;
+}
 
+void si4700_init(void)
+{
     /* check device id */
-    if (cache[DEVICEID] == 0x1242)
-    {
+    if (si4700_detect()) {
         tuner_present = true;
 
+        tuner_power(true);
+
+        /* read all registers */
+        si4700_read(16);
+        si4700_sleep(0);
+
 #ifdef USE_INTERNAL_OSCILLATOR
         /* Enable the internal oscillator
           (Si4702-16 needs this register to be initialised to 0x100) */
         si4700_write_set(TEST1, TEST1_XOSCEN | 0x100);
         sleep(HZ/2);
 #endif
-    }
 
-    si4700_sleep(1);
-
-    tuner_power(false);
+        si4700_sleep(1);
+        tuner_power(false);
+    }
 }
 
 static void si4700_set_frequency(int freq)