diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2016-12-20 10:33:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-09 13:41:12 +0100 |
| commit | e9be2ee4cb46e09adefe041a6b7a5b392738209e (patch) | |
| tree | dbfd4106e5ecca5f0ab0b2731126afc2b6958673 /drivers/net | |
| parent | a86f9ca8247a70c0a3f35c40d33aeb3fb3173aa7 (diff) | |
| download | barebox-e9be2ee4cb46e09adefe041a6b7a5b392738209e.tar.gz barebox-e9be2ee4cb46e09adefe041a6b7a5b392738209e.tar.xz | |
net: e1000: don't try to register eeprom if MTD support is missing
EEPROM support is an optional feature and the driver should work
just fine without it.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 6f9dddaf23..00d18adff1 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -3588,10 +3588,13 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id) return -EINVAL; } - ret = e1000_register_eeprom(hw); - if (ret < 0) { - dev_err(&pdev->dev, "failed to register EEPROM devices!\n"); - return ret; + if (IS_ENABLED(CONFIG_MTD)) { + ret = e1000_register_eeprom(hw); + if (ret < 0) { + dev_err(&pdev->dev, + "failed to register EEPROM devices!\n"); + return ret; + } } if (e1000_validate_eeprom_checksum(hw)) |