From e224144e9a0303b06c466b6acb00b36f6ff0b76a Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <djwong@us.ibm.com>
Date: Fri, 15 Aug 2008 00:40:40 -0700
Subject: [PATCH] --- yaml --- r: 108486 b: refs/heads/master c:
 9c5413eac5199b8457689eb2c9d9e75138356bd6 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/hwmon/ibmaem.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f28db53a2eca..5d7fbff3a489 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb93b7df7e66597fa807e34a0f812ffff7ff165b
+refs/heads/master: 9c5413eac5199b8457689eb2c9d9e75138356bd6
diff --git a/trunk/drivers/hwmon/ibmaem.c b/trunk/drivers/hwmon/ibmaem.c
index 5e4775a62f6c..08c5179e6d84 100644
--- a/trunk/drivers/hwmon/ibmaem.c
+++ b/trunk/drivers/hwmon/ibmaem.c
@@ -676,7 +676,8 @@ static int aem_find_aem2(struct aem_ipmi_data *data,
 		return -ETIMEDOUT;
 
 	if (data->rx_result || data->rx_msg_len != sizeof(*fi_resp) ||
-	    memcmp(&fi_resp->id, &system_x_id, sizeof(system_x_id)))
+	    memcmp(&fi_resp->id, &system_x_id, sizeof(system_x_id)) ||
+	    fi_resp->num_instances <= instance_num)
 		return -ENOENT;
 
 	return 0;