E1000 - pci probing

- once we know it is not an Intel device, it is not a match

diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c
index 90235f0ff1c60f15bc1a1b1d7b2fac5d32779c90..c6ffb2ca6da4b9c3df703e1b0161b252a7187d0c 100644 (file)
--- 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;