From e9be2ee4cb46e09adefe041a6b7a5b392738209e Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Tue, 20 Dec 2016 10:33:34 +0100 Subject: [PATCH] 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 Signed-off-by: Sascha Hauer --- drivers/net/e1000/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 6f9dddaf2..00d18adff 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))