kernel: cleanup makefile for $CONF.$O target

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

diff --git a/sys/src/9/pc/usbohci.c b/sys/src/9/pc/usbohci.c
index 588a9cebb7090551e922e6e056e5efb5ce3b55e5..d24f2388e463ca2ffa944d066054035bc7f746be 100644 (file)
--- a/sys/src/9/pc/usbohci.c
+++ b/sys/src/9/pc/usbohci.c
@@ -2405,12 +2405,14 @@ scanpci(void)
                        print("ohci: no memory\n");
                        continue;
                }
+               if((ctlr->ohci = vmap(io, p->mem[0].size)) == nil){
+                       print("ohci: can't map ohci\n");
+                       free(ctlr);
+                       continue;
+               }
                ctlr->pcidev = p;
                ctlr->base = io;
-               ctlr->ohci = vmap(io, p->mem[0].size);
                dprint("scanpci: ctlr %#p, ohci %#p\n", ctlr, ctlr->ohci);
-               pcisetbme(p);
-               pcisetpms(p, 0);
                for(i = 0; i < Nhcis; i++)
                        if(ctlrs[i] == nil){
                                ctlrs[i] = ctlr;
@@ -2577,11 +2579,15 @@ reset(Hci *hp)
        iunlock(&resetlck);
        if(ctlrs[i] == nil || i == Nhcis)
                return -1;
-       if(ctlr->ohci->control == ~0)
-               return -1;
-
 
        p = ctlr->pcidev;
+       pcienable(p);
+
+       if(ctlr->ohci->control == ~0){
+               pcidisable(p);
+               return -1;
+       }
+
        hp->aux = ctlr;
        hp->port = ctlr->base;
        hp->irq = p->intl;
@@ -2591,6 +2597,8 @@ reset(Hci *hp)
        ohcireset(ctlr);
        ohcimeminit(ctlr);
 
+       pcisetbme(p);
+
        /*
         * Linkage to the generic HCI driver.
         */