diff options
| author | Hidetoshi Shimokawa <simokawa@FreeBSD.org> | 2007-06-08 09:04:30 +0000 |
|---|---|---|
| committer | Hidetoshi Shimokawa <simokawa@FreeBSD.org> | 2007-06-08 09:04:30 +0000 |
| commit | c59557f5d406f8d403080e1dbfdfd32572ccf71c (patch) | |
| tree | 3e9cb401d0a8d5c63edfea0574831d2f3b8fff53 /sys/dev/firewire/firewire.c | |
| parent | 55f84274e33b6b57cd8349c997a10c4036acedf3 (diff) | |
Notes
Diffstat (limited to 'sys/dev/firewire/firewire.c')
| -rw-r--r-- | sys/dev/firewire/firewire.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 2857d9d45c16..3279dbac6977 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -316,7 +316,6 @@ fw_asystart(struct fw_xfer *xfer) s = splfw(); /* Protect from interrupt/timeout */ FW_GLOCK(fc); - microtime(&xfer->tv); xfer->flag = FWXF_INQ; STAILQ_INSERT_TAIL(&xfer->q->q, xfer, link); #if 0 @@ -364,12 +363,12 @@ firewire_xfer_timeout(void *arg, int pending) FW_GLOCK(fc); for (i = 0; i < 0x40; i ++) { while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) { - if (timevalcmp(&xfer->tv, &tv, >)) - /* the rests are newer than this */ - break; if ((xfer->flag & FWXF_SENT) == 0) /* not sent yet */ break; + if (timevalcmp(&xfer->tv, &tv, >)) + /* the rests are newer than this */ + break; device_printf(fc->bdev, "split transaction timeout: " "tl=0x%x flag=0x%02x\n", i, xfer->flag); |