diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index f2c1cde96221..b9fd5111d3f9 100644
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -132,7 +132,7 @@ static void hd_buffer_constraints(struct greybus_host_device *hd)
 	 * that's better aligned for the user.
 	 */
 	hd->buffer_headroom = sizeof(u32);	/* For cport id */
-	hd->buffer_size_max = ES1_GBUF_MSG_SIZE_MAX;
+	hd->buffer_size_max = ES1_GBUF_MSG_SIZE_MAX - hd->buffer_headroom;
 	BUILD_BUG_ON(hd->buffer_headroom > GB_BUFFER_HEADROOM_MAX);
 }