From 552f89902269d6ed787e8f2f420203ad4723f0bf Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 28 Nov 2002 17:05:47 +0000
Subject: [PATCH] Fix Vaio EEPROM misdetection

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1653 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 prog/sensors/chips.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c
index a7b62163..e2a0342b 100644
--- a/prog/sensors/chips.c
+++ b/prog/sensors/chips.c
@@ -2442,15 +2442,33 @@ void print_eeprom(const sensors_chip_name *name)
            print_label(label, 24);
 	   printf("RAMBUS RIMM SPD\n");
 	   rambus = 1;
-	} else
+	} else if(((int) a) == 0) {
 	   vaio = 1;
+	} else {
+	   free_the_label(&label);
+           return;
+	}
       }
    } else
       printf("ERROR: data 1\n");
    free_the_label(&label);
    
-   if(vaio)
-   {
+   if(vaio) {
+      /* first make sure it is a Vaio EEPROM (could still be some ddcmon) */
+      if(!sensors_get_feature(*name, SENSORS_EEPROM_ROWADDR, &a) &&
+       !sensors_get_feature(*name, SENSORS_EEPROM_COLADDR, &b) &&
+       !sensors_get_feature(*name, SENSORS_EEPROM_NUMROWS, &c)) {
+      	if(((int) a) != 0 || ((int) b) != 0 || ((int) c) !=0) {
+	   /* not a memory chip nor a Vaio EEPROM, so leave */
+	   return;
+	}
+      } else {
+        printf("ERROR: data Vaio 2\n");
+	return;
+      }
+   }
+
+   if(vaio) {
       char buffer[33];
       memset(buffer, '\0', 33);
       
@@ -2475,7 +2493,7 @@ void print_eeprom(const sensors_chip_name *name)
 	 print_label(label, 24);
 	 printf("%s\n", buffer);
       } else
-         printf("ERROR: data Vaio 2\n");
+         printf("ERROR: data Vaio 3\n");
       free_the_label(&label);
 
       return;