kernel: cleanup the software mouse cursor mess

[plan9front.git] / sys / src / 9 / pc / ether83815.c

diff --git a/sys/src/9/pc/ether83815.c b/sys/src/9/pc/ether83815.c
index 5b7534ce70880cc0611d7c304f94b2a65aeeb38c..a65fe719ed167ac3c7fc6505ac7acc653d366768 100644 (file)
--- a/sys/src/9/pc/ether83815.c
+++ b/sys/src/9/pc/ether83815.c
@@ -1098,13 +1098,6 @@ scanpci83815(void)
                        free(ctlr);
                        continue;
                }
-
-               if(softreset(ctlr, 0) == -1){
-                       free(ctlr);
-                       continue;
-               }
-               srom(ctlr);
-
                if(ctlrhead != nil)
                        ctlrtail->next = ctlr;
                else
@@ -1148,6 +1141,10 @@ reset(Ether* ether)
        if(ctlr == nil)
                return -1;
 
+       pcienable(ctlr->pcidev);
+       softreset(ctlr, 0);
+       srom(ctlr);
+
        ether->ctlr = ctlr;
        ether->port = ctlr->port;
        ether->irq = ctlr->pcidev->intl;