diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c
index ef3cc33772f8..e5d216646b9c 100644
--- a/drivers/staging/greybus/spi.c
+++ b/drivers/staging/greybus/spi.c
@@ -299,7 +299,7 @@ static int gb_spi_connection_init(struct gb_connection *connection)
 	if (ret)
 		goto out_err;
 
-	master->bus_num = 0;		/* How do we get controller id here? */
+	master->bus_num = -1; /* Allow spi-core to allocate it dynamically */
 	master->num_chipselect = spi->num_chipselect;
 	master->mode_bits = spi->mode;
 	master->flags = spi->flags;