summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-01-11 10:03:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-01-17 09:02:47 +0100
commitdb02aac6be9267ccc1a93ffec6c1f49352cf719a (patch)
treed7be6f1c21cbb083d8cefa273ba2f3c3044b7ad2 /drivers/net/e1000
parent896894088e7de081caddb5fc8dc653bc0f5ac7bb (diff)
downloadbarebox-db02aac6be9267ccc1a93ffec6c1f49352cf719a.tar.gz
barebox-db02aac6be9267ccc1a93ffec6c1f49352cf719a.tar.xz
net/e1000: fix driver probing in the presence of two e1000 devices
The .id member of the struct device for the invm device is not initialized and so implicitly zero. This yields: register_device: already registered invm0 for the second i210 during probe. So use the parent's id to initialize the id for invm, too, as is already done for the corresponding e1000-nor device. Fixes: a74b97f009c6 ("e1000: Expose i210's iNVM as a cdev") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/eeprom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 23fb05ec72..748d8afe79 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -1504,6 +1504,7 @@ int e1000_register_invm(struct e1000_hw *hw)
return ret;
strcpy(hw->invm.dev.name, "invm");
+ hw->invm.dev.id = hw->dev->id;
hw->invm.dev.parent = hw->dev;
ret = register_device(&hw->invm.dev);
if (ret < 0) {