diff --git a/drivers/staging/greybus/hd.c b/drivers/staging/greybus/hd.c
index 74569a38698a..e38c41c31f04 100644
--- a/drivers/staging/greybus/hd.c
+++ b/drivers/staging/greybus/hd.c
@@ -72,20 +72,12 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
 	if (!hd)
 		return ERR_PTR(-ENOMEM);
 
-	hd->dev.parent = parent;
-	hd->dev.bus = &greybus_bus_type;
-	hd->dev.type = &greybus_hd_type;
-	hd->dev.dma_mask = hd->dev.parent->dma_mask;
-	device_initialize(&hd->dev);
-
 	ret = ida_simple_get(&gb_hd_bus_id_map, 1, 0, GFP_KERNEL);
 	if (ret < 0) {
 		kfree(hd);
 		return ERR_PTR(ret);
 	}
-
 	hd->bus_id = ret;
-	dev_set_name(&hd->dev, "greybus%d", hd->bus_id);
 
 	hd->driver = driver;
 	INIT_LIST_HEAD(&hd->interfaces);
@@ -94,6 +86,13 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
 	hd->buffer_size_max = buffer_size_max;
 	hd->num_cports = num_cports;
 
+	hd->dev.parent = parent;
+	hd->dev.bus = &greybus_bus_type;
+	hd->dev.type = &greybus_hd_type;
+	hd->dev.dma_mask = hd->dev.parent->dma_mask;
+	device_initialize(&hd->dev);
+	dev_set_name(&hd->dev, "greybus%d", hd->bus_id);
+
 	return hd;
 }
 EXPORT_SYMBOL_GPL(gb_hd_create);