[087/115] 3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)

Message ID 1369047116-9378-88-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques May 20, 2013, 10:51 a.m. -stable review patch.  If anyone has any objections, please let me know.


From: Matthew Whitehead <tedheadster@gmail.com>

commit 3b54912f9cd167641b91d4a697bd742f70e534fe upstream.

The venerable 3c509 driver only sets its device parent in one case, the ISAPnP one.
It does this with the SET_NETDEV_DEV function. It should register with the device
hierarchy in two additional cases: standard (non-PnP) ISA and EISA.

- Currently they appear here:
/sys/devices/virtual/net/eth0 (standard ISA)
/sys/devices/virtual/net/eth1 (EISA)

- Rather, they should instead be here:
/sys/devices/isa/3c509.0/net/eth0 (standard ISA)
/sys/devices/pci0000:00/0000:00:07.0/00:04/net/eth1 (EISA)

Tested on ISA and EISA boards.

Signed-off-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
 drivers/net/ethernet/3com/3c509.c | 2 ++
 1 file changed, 2 insertions(+)


diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 1a8eef2..ce8fb21 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -308,6 +308,7 @@  static int __devinit el3_isa_match(struct device *pdev,
 	if (!dev)
 		return -ENOMEM;
+	SET_NETDEV_DEV(dev, pdev);
 	if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) {
@@ -598,6 +599,7 @@  static int __init el3_eisa_probe (struct device *device)
 		return -ENOMEM;
+	SET_NETDEV_DEV(dev, device);
 	el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA);