xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nusb/usbd: fix portreset error handling

Browse source 
error handling in portreset() was wrong. we called closedev()
on the device without changing the reference.

just call portdetach() when the reset fails.
This commit is contained in:
cinap_lenrek 2020-04-05 03:05:06 +02:00
parent 315f20b9f4
commit ecba7822e3
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sys/src/cmd/nusb/usbd/hub.c
View file

@ -543,7 +543,6 @@ portreset(Hub *h, int p)
d = h->dev;
pp = &h->port[p];
nd = pp->dev;
dprint(2, "%s: %s: port %d: resetting\n", argv0, d->dir, p);
if(hubfeature(h, p, Fportreset, 1) < 0){
dprint(2, "%s: %s: port %d: reset: %r\n", argv0, d->dir, p);
@ -557,7 +556,8 @@ portreset(Hub *h, int p)
dprint(2, "%s: %s: port %d: not enabled?\n", argv0, d->dir, p);
goto Fail;
}
nd = pp->dev;
if((nd = pp->dev) == nil)
return;
opendevdata(nd, ORDWR);
if(usbcmd(nd, Rh2d|Rstd|Rdev, Rsetaddress, nd->id, 0, nil, 0) < 0){
dprint(2, "%s: %s: port %d: setaddress: %r\n", argv0, d->dir, p);
@ -579,15 +579,10 @@ portreset(Hub *h, int p)
}
return;
Fail:
pp->state = Pdisabled;
pp->sts = 0;
if(pp->hub != nil)
pp->hub = nil; /* hub closed by enumhub */
if(!h->dev->isusb3)
portdetach(h, p);
if(!d->isusb3)
hubfeature(h, p, Fportenable, 0);
if(nd != nil)
devctl(nd, "detach");
closedev(nd);
}
static int