From 979d925223ac976a6530c61afc12c12410e9546c Mon Sep 17 00:00:00 2001
From: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Date: Tue, 29 Jun 2010 14:44:40 +0000
Subject: [PATCH] Check that the expected winbond Super I/O was found

Corresponding to flashrom svn r1064.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
---
 board_enable.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/board_enable.c b/board_enable.c
index 940ecb92c..9c88f0b14 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -264,6 +264,11 @@ static int winbond_gpio_set(uint16_t base, enum winbond_id chipid,
 		msg_perr("\nERROR: No supported Winbond Super I/O found\n");
 		return -1;
 	}
+	if (chip->device_id != chipid) {
+		msg_perr("\nERROR: Found Winbond chip with ID 0x%x, "
+		         "expected %x\n", chip->device_id, chipid);
+		return -1;
+	}
 	if (bit >= 8 || port == 0 || port > chip->gpio_port_count) {
 		msg_perr("\nERROR: winbond_gpio_set: Invalid GPIO number %d\n",
 		         pin);