Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / drivers / misc / eeprom_93cx6.c

diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c
index 0d6d742d42c351b61f30b908298c7c1dac365b57..ea55654e5948255afdf82679e76bb1b5f3078047 100644 (file)
--- a/drivers/misc/eeprom_93cx6.c
+++ b/drivers/misc/eeprom_93cx6.c
@@ -42,10 +42,10 @@ static inline void eeprom_93cx6_pulse_high(struct eeprom_93cx6 *eeprom)
 
        /*
         * Add a short delay for the pulse to work.
-        * According to the specifications the minimal time
-        * should be 450ns so a 1us delay is sufficient.
+        * According to the specifications the "maximum minimum"
+        * time should be 450ns.
         */
-       udelay(1);
+       ndelay(450);
 }
 
 static inline void eeprom_93cx6_pulse_low(struct eeprom_93cx6 *eeprom)
@@ -55,10 +55,10 @@ static inline void eeprom_93cx6_pulse_low(struct eeprom_93cx6 *eeprom)
 
        /*
         * Add a short delay for the pulse to work.
-        * According to the specifications the minimal time
-        * should be 450ns so a 1us delay is sufficient.
+        * According to the specifications the "maximum minimum"
+        * time should be 450ns.
         */
-       udelay(1);
+       ndelay(450);
 }
 
 static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)