diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index 4db337cf7acc2138b699c8e1a6a34fe6c6f50e24..601ee6fc81d50ec1c321fa08705870e957101b6b 100644
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -490,8 +490,8 @@ static void gb_hid_disconnect(struct gb_bundle *bundle)
 {
 	struct gb_hid *ghid = greybus_get_drvdata(bundle);
 
-	gb_connection_disable(ghid->connection);
 	hid_destroy_device(ghid->hid);
+	gb_connection_disable(ghid->connection);
 	gb_connection_destroy(ghid->connection);
 	kfree(ghid);
 }