diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c
index 2883947fb630..50139f41fe20 100644
--- a/drivers/staging/greybus/module.c
+++ b/drivers/staging/greybus/module.c
@@ -107,6 +107,17 @@ void gb_module_destroy(struct gb_module *gmod)
 	kfree(gmod);
 }
 
+struct gb_module *gb_module_find(struct greybus_host_device *hd, u8 module_id)
+{
+	struct gb_module *module;
+
+	list_for_each_entry(module, &hd->modules, links)
+		if (module->module_id == module_id)
+			return module;
+
+	return NULL;
+}
+
 void gb_module_interfaces_init(struct gb_module *gmod)
 {
 	struct gb_interface *interface;
diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/module.h
index 2c6707d6d85f..82def46e5ab1 100644
--- a/drivers/staging/greybus/module.h
+++ b/drivers/staging/greybus/module.h
@@ -52,6 +52,9 @@ struct gb_module *gb_module_create(struct greybus_host_device *hd,
 					u8 module_id);
 void gb_module_destroy(struct gb_module *module);
 
+struct gb_module *gb_module_find(struct greybus_host_device *hd,
+				u8 module_id);
+
 void gb_module_interfaces_init(struct gb_module *gmod);
 
 #endif /* __MODULE_H */