diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 0edccc82ece5afa8e66d58720623affff39c356c..cc83cdd969ceb4304405885f39c83f5fb31ae4a3 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -552,6 +552,9 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n)
 	struct boardinfo *bi;
 	int i;
 
+	if (!n)
+		return -EINVAL;
+
 	bi = kzalloc(n * sizeof(*bi), GFP_KERNEL);
 	if (!bi)
 		return -ENOMEM;