diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 0cc9fe660d12..8138bc22efbc 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -695,11 +695,11 @@ static void ap_disconnect(struct usb_interface *interface)
 	struct es2_ap_dev *es2 = usb_get_intfdata(interface);
 	int i;
 
+	gb_hd_del(es2->hd);
+
 	for (i = 0; i < NUM_BULKS; ++i)
 		es2_cport_in_disable(es2, &es2->cport_in[i]);
 
-	gb_hd_del(es2->hd);
-
 	es2_destroy(es2);
 }