summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-03-28 19:59:42 -0500
committerJody McIntyre <scjody@modernduck.com>2006-03-28 19:59:42 -0500
commit556640510d7e15664cb9bf2f70f7519bfedd6c29 (patch)
tree5c555b9c49119f243d969bd5d8ac1032e84c2cd7
parent180a43044faeaa9bfe0c604d472023a6446430b5 (diff)
downloadop-kernel-dev-556640510d7e15664cb9bf2f70f7519bfedd6c29.zip
op-kernel-dev-556640510d7e15664cb9bf2f70f7519bfedd6c29.tar.gz
sbp2: check for ARM failure
Sbp2 did not check for successful registration of the lower address range when CONFIG_IEEE1394_SBP2_PHYS_DMA was set. If hpsb_register_addrspace failed, a "login timed-out" would occur which is misleading. Now sbp2 logs a sensible error message. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jody McIntyre <scjody@modernduck.com>
-rw-r--r--drivers/ieee1394/sbp2.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 0b2b0da..ce3b43d 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -749,9 +749,13 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
#ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA
/* Handle data movement if physical dma is not
- * enabled/supportedon host controller */
- hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host, &sbp2_physdma_ops,
- 0x0ULL, 0xfffffffcULL);
+ * enabled or not supported on host controller */
+ if (!hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host,
+ &sbp2_physdma_ops,
+ 0x0ULL, 0xfffffffcULL)) {
+ SBP2_ERR("failed to register lower 4GB address range");
+ goto failed_alloc;
+ }
#endif
}
OpenPOWER on IntegriCloud