From: Erik van der Kouwe Date: Wed, 13 Jul 2011 09:36:10 +0000 (+0200) Subject: Fix e1000 bug introduced in 123cf7 X-Git-Tag: v3.2.0~466 X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=66bc7580c79288441a56a6eedfb69615c97ecf43;p=minix.git Fix e1000 bug introduced in 123cf7 --- diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c index b712f679f..c9980b1a6 100644 --- a/drivers/e1000/e1000.c +++ b/drivers/e1000/e1000.c @@ -952,7 +952,7 @@ int reg; (reg << e->eeprom_addr_off) | (E1000_REG_EERD_START)); /* Wait until ready. */ - while (!(data = (e1000_reg_read(e, E1000_REG_EERD)) & e->eeprom_done_bit)); + while (!((data = (e1000_reg_read(e, E1000_REG_EERD))) & e->eeprom_done_bit)); return data >> 16; }