summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2006-12-04 22:12:52 +0100
committerMichael Brown2006-12-04 22:12:52 +0100
commitf944737045487ca7c3cda94556c66b08fca7966c (patch)
treefe0bb222f86f7ce5bb5fb165183e10ccd1cf452e
parentMigrated etherfabric driver to using generic SPI layer. (diff)
downloadipxe-f944737045487ca7c3cda94556c66b08fca7966c.tar.gz
ipxe-f944737045487ca7c3cda94556c66b08fca7966c.tar.xz
ipxe-f944737045487ca7c3cda94556c66b08fca7966c.zip
Fixed two logic errors that were cancelling each other out.
-rw-r--r--src/drivers/net/etherfabric.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c
index 2afd852c6..178976661 100644
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -2273,7 +2273,7 @@ static int falcon_spi_rw ( struct spi_bus *bus, struct spi_device *device,
memcpy ( data_in, &reg, len );
}
- return 1;
+ return 0;
}
/**
@@ -2315,8 +2315,8 @@ static int falcon_read_eeprom ( struct efab_nic *efab ) {
nvs = ( efab->has_flash ?
&efab->falcon_flash.nvs : &efab->falcon_eeprom.nvs );
- return nvs_read ( nvs, FALCON_MAC_ADDRESS_OFFSET ( efab->port ),
- efab->mac_addr, sizeof ( efab->mac_addr ) );
+ return ( nvs_read ( nvs, FALCON_MAC_ADDRESS_OFFSET ( efab->port ),
+ efab->mac_addr, sizeof ( efab->mac_addr ) ) == 0 );
}
/** RX descriptor */