diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index e203180e1e5c..5418f4675ec1 100644
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -563,6 +563,12 @@ static int ap_probe(struct usb_interface *interface,
 		return PTR_ERR(hd);
 	}
 
+	/* Initialize AP's greybus interface */
+	if (!gb_ap_svc_connection_create(hd)) {
+		retval = -EINVAL;
+		goto error;
+	}
+
 	es1 = hd_to_es1(hd);
 	es1->hd = hd;
 	es1->usb_intf = interface;
@@ -632,12 +638,6 @@ static int ap_probe(struct usb_interface *interface,
 		es1->cport_out_urb_busy[i] = false;	/* just to be anal */
 	}
 
-	/* Initialize AP's greybus interface */
-	if (!gb_ap_svc_connection_create(hd)) {
-		retval = -EINVAL;
-		goto error;
-	}
-
 	apb1_log_enable_dentry = debugfs_create_file("apb1_log_enable",
 							(S_IWUSR | S_IRUGO),
 							gb_debugfs_get(), es1,
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index aba1927fc34f..d2c054a2ec0e 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -663,6 +663,12 @@ static int ap_probe(struct usb_interface *interface,
 		return PTR_ERR(hd);
 	}
 
+	/* Initialize AP's greybus interface */
+	if (!gb_ap_svc_connection_create(hd)) {
+		retval = -EINVAL;
+		goto error;
+	}
+
 	es1 = hd_to_es1(hd);
 	es1->hd = hd;
 	es1->usb_intf = interface;
@@ -736,12 +742,6 @@ static int ap_probe(struct usb_interface *interface,
 		es1->cport_out_urb_busy[i] = false;	/* just to be anal */
 	}
 
-	/* Initialize AP's greybus interface */
-	if (!gb_ap_svc_connection_create(hd)) {
-		retval = -EINVAL;
-		goto error;
-	}
-
 	apb1_log_enable_dentry = debugfs_create_file("apb1_log_enable",
 							(S_IWUSR | S_IRUGO),
 							gb_debugfs_get(), es1,