From db02aac6be9267ccc1a93ffec6c1f49352cf719a Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Thu, 11 Jan 2018 10:03:26 +0100 Subject: net/e1000: fix driver probing in the presence of two e1000 devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sascha Hauer --- drivers/net/e1000/eeprom.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/net/e1000') 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) { -- cgit v1.2.3