diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index cc278bcb499d..9cb9c9d590d2 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -283,9 +283,9 @@ static void gb_operation_gbuf_complete(struct gbuf *gbuf)
 		int type;
 
 		if (gbuf == operation->request)
-			header = operation->request_payload;
+			header = operation->request->transfer_buffer;
 		else if (gbuf == operation->response)
-			header = operation->response_payload;
+			header = operation->response->transfer_buffer;
 		else
 			header = NULL;