From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/9] net: e1000: don't try to register eeprom if MTD support is missing
Date: Tue, 20 Dec 2016 10:33:34 +0100 [thread overview]
Message-ID: <20161220093340.14404-3-l.stach@pengutronix.de> (raw)
In-Reply-To: <20161220093340.14404-1-l.stach@pengutronix.de>
EEPROM support is an optional feature and the driver should work
just fine without it.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
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 6f9dddaf232a..00d18adff111 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))
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2016-12-20 9:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 9:33 [PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in Lucas Stach
2016-12-20 9:33 ` [PATCH 2/9] arm64: disable PBL support Lucas Stach
2016-12-20 9:33 ` Lucas Stach [this message]
2016-12-20 9:33 ` [PATCH 4/9] globalvar: select FNMATCH Lucas Stach
2016-12-20 9:33 ` [PATCH 5/9] nvvar: add static inline dummy for nvvar_save Lucas Stach
2016-12-20 9:33 ` [PATCH 6/9] devparam: add static inline dummy for dev_add_param_bitmask Lucas Stach
2016-12-20 9:33 ` [PATCH 7/9] arm: pbl: rename linker script for uncompressed image data Lucas Stach
2016-12-20 9:33 ` [PATCH 8/9] lib: add generic find_bit implementation from Linux and use in ARMv8 Lucas Stach
2017-01-09 16:05 ` Sascha Hauer
2016-12-20 9:33 ` [PATCH 9/9] arm: ARM64 doesn't provide the armlinux_* functions Lucas Stach
2017-01-09 10:25 ` [PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161220093340.14404-3-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox