From 2c1e6f5d47d3846f2220998374837358d36849c4 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Thu, 1 Dec 2011 01:37:33 +0200 Subject: [PATCH] --- yaml --- r: 280054 b: refs/heads/master c: d2554f50df9be3c53a13f7541a5f4d054bd56cc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firmware/google/gsmi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 289d417204b9..298c685eb9eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a3072be6ce00b10565c78da05ad78df41310045 +refs/heads/master: d2554f50df9be3c53a13f7541a5f4d054bd56cc3 diff --git a/trunk/drivers/firmware/google/gsmi.c b/trunk/drivers/firmware/google/gsmi.c index c4e7c59d1c63..91ddf0f7a1b9 100644 --- a/trunk/drivers/firmware/google/gsmi.c +++ b/trunk/drivers/firmware/google/gsmi.c @@ -345,7 +345,8 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name, memcpy(¶m, gsmi_dev.param_buf->start, sizeof(param)); /* The size reported is the min of all of our buffers */ - *data_size = min(*data_size, gsmi_dev.data_buf->length); + *data_size = min_t(unsigned long, *data_size, + gsmi_dev.data_buf->length); *data_size = min_t(unsigned long, *data_size, param.data_len); /* Copy data back to return buffer. */