From 6efa093c02925040a2e3e8786f258b86fc055739 Mon Sep 17 00:00:00 2001 From: Parag Warudkar Date: Wed, 30 Jan 2008 13:31:59 +0100 Subject: [PATCH] --- yaml --- r: 80084 b: refs/heads/master c: bca25bafbb390eeec376ac994954b99489d198ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/dmi.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85c4349ebd3b..674f5e770f83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79da4721117fcf188b4b007b775738a530f574da +refs/heads/master: bca25bafbb390eeec376ac994954b99489d198ec diff --git a/trunk/include/asm-x86/dmi.h b/trunk/include/asm-x86/dmi.h index 8e2b0e6aa8e7..5008c365e6e4 100644 --- a/trunk/include/asm-x86/dmi.h +++ b/trunk/include/asm-x86/dmi.h @@ -22,8 +22,9 @@ extern char dmi_alloc_data[DMI_MAX_DATA]; static inline void *dmi_alloc(unsigned len) { int idx = dmi_alloc_index; - if ((dmi_alloc_index += len) > DMI_MAX_DATA) + if ((dmi_alloc_index + len) > DMI_MAX_DATA) return NULL; + dmi_alloc_index += len; return dmi_alloc_data + idx; }