Internalize tuner init

3 files changed, 8 insertions, 6 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 81d6736..30af6af 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -79,8 +79,6 @@ impl RtlSdr {
                         };
 
                         info!("Found tuner {}", tuner.display());
-
-                        tuner.init();
                     }
                 }
             }
diff --git a/src/tuners/fc0013.rs b/src/tuners/fc0013.rs
index 9534b7d..fed1289 100644
--- a/src/tuners/fc0013.rs
+++ b/src/tuners/fc0013.rs
@@ -18,10 +18,12 @@ pub const TUNER_INFO: TunerInfo = TunerInfo {
 
 impl<'a> FC0013<'a> {
     pub fn new(handle: &'a RtlSdrDeviceHandle) -> FC0013<'a> {
-        FC0013 {
+        let tuner = FC0013 {
             device: TUNER_INFO,
             handle: handle,
-        }
+        };
+        tuner.init();
+        tuner
     }
 }
 
diff --git a/src/tuners/r820t.rs b/src/tuners/r820t.rs
index 74ac740..9844b41 100644
--- a/src/tuners/r820t.rs
+++ b/src/tuners/r820t.rs
@@ -20,10 +20,12 @@ pub const TUNER_INFO: TunerInfo = TunerInfo {
 
 impl<'a> R820T<'a> {
     pub fn new(handle: &'a RtlSdrDeviceHandle) -> R820T<'a> {
-        R820T {
+        let tuner = R820T {
             device: TUNER_INFO,
             handle: handle,
-        }
+        };
+        tuner.init();
+        tuner
     }
 }