From 6dea092dece25c8b275b3ee00dee9f4a332413cf Mon Sep 17 00:00:00 2001 From: Tomas Hruby Date: Thu, 7 Jul 2011 17:26:39 +0000 Subject: [PATCH] E1000 - pci probing - once we know it is not an Intel device, it is not a match --- drivers/e1000/e1000.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c index 90235f0ff..c6ffb2ca6 100644 --- a/drivers/e1000/e1000.c +++ b/drivers/e1000/e1000.c @@ -250,11 +250,13 @@ PRIVATE int e1000_probe(e1000_t *e, int skip) /* Loop devices on the PCI bus. */ for(;;) { + E1000_DEBUG(3, ("%s: probe() devind %d vid 0x%x did 0x%x\n", + e->name, devind, vid, did)); + if (vid != 0x8086) + goto get_next; + for (i = 0; pcitab_e1000[i] != 0; i++) { - if (vid != 0x8086) - continue; - if (did != pcitab_e1000[i]) continue; else @@ -267,6 +269,7 @@ PRIVATE int e1000_probe(e1000_t *e, int skip) skip--; } +get_next: if (!(r = pci_next_dev(&devind, &vid, &did))) { return FALSE; -- 2.44.0