From 16dbbeec744275d8d81435ad4c98a6534e987dc8 Mon Sep 17 00:00:00 2001 From: Hidetoshi Shimokawa Date: Wed, 30 Apr 2003 10:20:24 +0000 Subject: [PATCH] Set status to FWDEVINVAL if probe failed. --- sys/dev/firewire/firewire.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 853c586ba522..7875d60daebc 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -1357,23 +1357,20 @@ fw_bus_explore_callback(struct fw_xfer *xfer) if(xfer->resp != 0){ printf("node%d: resp=%d addr=0x%x\n", fc->ongonode, xfer->resp, fc->ongoaddr); - fc->retry_count++; - goto nextnode; + goto errnode; } if(xfer->send.buf == NULL){ printf("node%d: send.buf=NULL addr=0x%x\n", fc->ongonode, fc->ongoaddr); - fc->retry_count++; - goto nextnode; + goto errnode; } sfp = (struct fw_pkt *)xfer->send.buf; if(xfer->recv.buf == NULL){ printf("node%d: recv.buf=NULL addr=0x%x\n", fc->ongonode, fc->ongoaddr); - fc->retry_count++; - goto nextnode; + goto errnode; } rfp = (struct fw_pkt *)xfer->recv.buf; #if 0 @@ -1482,6 +1479,10 @@ fw_bus_explore_callback(struct fw_xfer *xfer) fw_xfer_free( xfer); fw_bus_explore(fc); return; +errnode: + fc->retry_count++; + if (fc->ongodev != NULL) + fc->ongodev->status = FWDEVINVAL; nextnode: fw_xfer_free( xfer); fc->ongonode++;