From 9b0ac1d457d8e2156b6518c47a5be2b14f5b6479 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Thu, 30 May 2002 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2002-05-30 --- pc/etherelnk3.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pc/etherelnk3.c b/pc/etherelnk3.c index ad68d9ac25662c98140dc59a6fddbf0064bde6e3..3654cf5e11762b20de7a1b5fdaedf6effbebca1e 100644 --- a/pc/etherelnk3.c +++ b/pc/etherelnk3.c @@ -1242,9 +1242,7 @@ tcmadapter(int port, int irq, Pcidev* pcidev) ctlr = malloc(sizeof(Ctlr)); ctlr->port = port; ctlr->irq = irq; - if(pcidev != nil){ - ctlr->pcidev = pcidev; - } + ctlr->pcidev = pcidev; if(ctlrhead != nil) ctlrtail->next = ctlr; @@ -1490,6 +1488,7 @@ static Ctlr* tcm5XXpcmcia(Ether* ether) { int i; + Ctlr *ctlr; if(ether->type == nil) return nil; @@ -1497,7 +1496,9 @@ tcm5XXpcmcia(Ether* ether) for(i = 0; tcmpcmcia[i] != nil; i++){ if(cistrcmp(ether->type, tcmpcmcia[i])) continue; - return tcmadapter(ether->port, ether->irq, nil); + ctlr = tcmadapter(ether->port, ether->irq, nil); + ctlr->active = 1; + return ctlr; } return nil; }