diff --git a/drivers/bus/mhi/Kconfig b/drivers/bus/mhi/Kconfig
index b39a11e6c624..b13f94386796 100644
--- a/drivers/bus/mhi/Kconfig
+++ b/drivers/bus/mhi/Kconfig
@@ -7,3 +7,5 @@
 
 source "drivers/bus/mhi/host/Kconfig"
 source "drivers/bus/mhi/ep/Kconfig"
+source "drivers/bus/mhi/devices/Kconfig"
+source "drivers/bus/mhi/controllers/Kconfig"
diff --git a/drivers/bus/mhi/Makefile b/drivers/bus/mhi/Makefile
index 46981331b38f..ac6f0fa5662f 100644
--- a/drivers/bus/mhi/Makefile
+++ b/drivers/bus/mhi/Makefile
@@ -3,3 +3,9 @@ obj-y += host/
 
 # Endpoint MHI stack
 obj-y += ep/
+
+# MHI Devices stack
+obj-y += devices/
+
+#MHI Controller stack
+obj-y += controllers/
diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c
index 3878d875bf5e..63744d87b817 100644
--- a/drivers/bus/mhi/host/init.c
+++ b/drivers/bus/mhi/host/init.c
@@ -1167,7 +1167,7 @@ int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl)
 					       mhi_cntrl->rddm_image);
 			if (ret) {
 				mhi_free_bhie_table(mhi_cntrl,
-						    mhi_cntrl->rddm_image);
+						   &mhi_cntrl->rddm_image);
 				goto error_reg_offset;
 			}
 		}