diff --git a/[refs] b/[refs] index 30be894f72b5..f6b815762b6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 605bebe23bf6ac66c0a717e663a7baa2f981294d +refs/heads/master: 7e9400f178d291b2208c4ed9aac0f425c1364000 diff --git a/trunk/drivers/misc/eeprom_93cx6.c b/trunk/drivers/misc/eeprom_93cx6.c index 0d6d742d42c3..ac515b0ef67c 100644 --- a/trunk/drivers/misc/eeprom_93cx6.c +++ b/trunk/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)