Changeset 6063

Timestamp:

07/19/12 18:47:54 (10 months ago)

Author:

khali

Message:

Don't choke when no SPD EEPROM is found while the eeprom or at24 driver
is loaded. This can happen, handle the case gracefully.

Location:

i2c-tools/branches/i2c-tools-3.1

Files:

• CHANGES (modified) (1 diff)
• eeprom/decode-dimms (modified) (3 diffs)

i2c-tools/branches/i2c-tools-3.1/CHANGES

@@ -5 +5 @@
   decode-dimms: Decode module configuration type of DDR2 SDRAM
                 Decode bus width extension of DDR3 SDRAM
+                Don't choke when no EEPROM is found
   i2c-dev.h: Minimize differences with kernel flavor
              Move SMBus helper functions to include/i2c/smbus.h

i2c-tools/branches/i2c-tools-3.1/eeprom/decode-dimms

@@ -1740 +1740 @@
 sub get_dimm_list
 {
-        my (@dirs, $dir, $file, @files);
+        my (@dirs, $dir, $opened, $file, @files);
 
         if ($use_sysfs) {
@@ -1750 +1750 @@
         foreach $dir (@dirs) {
                 next unless opendir(local *DIR, $dir);
+                $opened++;
                 while (defined($file = readdir(DIR))) {
                         if ($use_sysfs) {
@@ -1770 +1771 @@
         }
 
-        if (@files) {
-                return sort { $a->{file} cmp $b->{file} } @files;
-        } elsif (! -d '/sys/module/eeprom') {
-                print "No EEPROM found, are you sure the eeprom module is loaded?\n";
+        if (!$opened) {
+                print STDERR "No EEPROM found, try loading the eeprom or at24 module\n";
                 exit;
         }
+
+        return sort { $a->{file} cmp $b->{file} } @files;
 }