---

yaml --- r: 280054 b: refs/heads/master c: d2554f5 h: refs/heads/master v: v3
git-mirror · Dec 10, 2011 · 2c1e6f5 · 2c1e6f5
1 parent 9353d03
commit 2c1e6f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -345,7 +345,8 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name,
 		memcpy(&param, 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. */