diff --git a/devices/src/tpm.rs b/devices/src/tpm.rs
index fef10eed4..15089c8a0 100644
--- a/devices/src/tpm.rs
+++ b/devices/src/tpm.rs
@@ -259,7 +259,7 @@ impl Tpm {
     }
 
     fn reset(&mut self) -> Result<()> {
-        let cur_buff_size = self.emulator.get_buffer_size().unwrap();
+        let cur_buff_size = self.emulator.get_buffer_size();
         self.regs = [0; TPM_CRB_R_MAX];
         set_reg_field(
             &mut self.regs,
diff --git a/tpm/src/emulator.rs b/tpm/src/emulator.rs
index ea9c4a51c..d7885d449 100644
--- a/tpm/src/emulator.rs
+++ b/tpm/src/emulator.rs
@@ -454,12 +454,12 @@ impl Emulator {
         Ok(())
     }
 
-    pub fn get_buffer_size(&mut self) -> Result<usize> {
+    pub fn get_buffer_size(&mut self) -> usize {
         let mut curr_buf_size: usize = 0;
 
         match self.set_buffer_size(0, &mut curr_buf_size) {
-            Err(_) => Ok(TPM_CRB_BUFFER_MAX),
-            _ => Ok(curr_buf_size),
+            Err(_) => TPM_CRB_BUFFER_MAX,
+            _ => curr_buf_size,
         }
     }
 }