diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c
index 7ccf9a26dab3..3151876a717c 100644
--- a/drivers/staging/greybus/loopback.c
+++ b/drivers/staging/greybus/loopback.c
@@ -874,7 +874,7 @@ static int gb_loopback_connection_init(struct gb_connection *connection)
 	struct gb_loopback *gb;
 	int retval;
 	char name[DEBUGFS_NAMELEN];
-	struct kobject *kobj = &connection->bundle->intf->module->dev.kobj;
+	struct kobject *kobj = &connection->hd->endo->dev.kobj;
 
 	gb = kzalloc(sizeof(*gb), GFP_KERNEL);
 	if (!gb)
@@ -963,7 +963,7 @@ out_sysfs:
 static void gb_loopback_connection_exit(struct gb_connection *connection)
 {
 	struct gb_loopback *gb = connection->private;
-	struct kobject *kobj = &connection->bundle->intf->module->dev.kobj;
+	struct kobject *kobj = &connection->hd->endo->dev.kobj;
 
 	if (!IS_ERR_OR_NULL(gb->task))
 		kthread_stop(gb->task);