aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2008-01-18 11:15:52 -0500
committerRalf Baechle <ralf@linux-mips.org>2008-01-21 19:35:23 -0500
commit06675e6f4fb00a63575f4b85da305c3ab19e6e5d (patch)
tree44de5812ffda9fa328c201efca743c7d14e9bd57 /drivers/net
parent0487de91427925e7c43debeb948bdf53b10ef32c (diff)
tc35815: Use irq number for tc35815-mac platform device id
The tc35815-mac platform device used a pci bus number and a devfn to identify its target device, but the pci bus number may vary if some bus-bridges are found. Use irq number which is be unique for embedded controllers. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tc35815.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index d887c05588d5..370d329d15d9 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -611,7 +611,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data)
611{ 611{
612 struct platform_device *plat_dev = to_platform_device(dev); 612 struct platform_device *plat_dev = to_platform_device(dev);
613 struct pci_dev *pci_dev = data; 613 struct pci_dev *pci_dev = data;
614 unsigned int id = (pci_dev->bus->number << 8) | pci_dev->devfn; 614 unsigned int id = pci_dev->irq;
615 return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id; 615 return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id;
616} 616}
617 617