* fwohci_pci.c

	Improve error message for attach failure.

* sbp_targ.c
	- Add speed in struct sbp_targ_login.
	- Remove unnecessary htonl().

1 files changed, 9 insertions, 3 deletions

diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index 891c4b2..6f516ed 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -324,11 +324,17 @@ fwohci_pci_attach(device_t self)
 
 	err = fwohci_init(sc, self);
 
-	if (!err)
-		err = device_probe_and_attach(sc->fc.bdev);
+	if (err) {
+		device_printf(self, "fwohci_init failed with err=%d\n", err);
+		fwohci_pci_detach(self);
+		return EIO;
+	}
+
+	err = device_probe_and_attach(sc->fc.bdev);
 
 	if (err) {
-		device_printf(self, "FireWire init failed with err=%d\n", err);
+		device_printf(self, "probe_and_attach failed with err=%d\n",
+		    err);
 		fwohci_pci_detach(self);
 		return EIO;
 	}