From 5c67c388cecebbb6d173e51a8aab5fb9befa2c7b Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Fri, 18 May 2012 18:39:39 +0200
Subject: [PATCH] --- yaml --- r: 307585 b: refs/heads/master c:
 473ffe6560fd5fa5fd5a488e8948899231972bd5 h: refs/heads/master i:   307583:
 08677e75104bd3fb34f7853d62c0d0d5f68c4b3e v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firewire/sbp2.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa8f02a96ab0..b687dc4f9b47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ad8c6a22d03a1598f7cc6585c65354dadca62ad
+refs/heads/master: 473ffe6560fd5fa5fd5a488e8948899231972bd5
diff --git a/trunk/drivers/firewire/sbp2.c b/trunk/drivers/firewire/sbp2.c
index b7e65d7eab64..2e202d3bf84d 100644
--- a/trunk/drivers/firewire/sbp2.c
+++ b/trunk/drivers/firewire/sbp2.c
@@ -1163,7 +1163,8 @@ static int sbp2_probe(struct device *dev)
 
 	shost->max_cmd_len = SBP2_MAX_CDB_SIZE;
 
-	if (scsi_add_host(shost, &unit->device) < 0)
+	if (scsi_add_host_with_dma(shost, &unit->device,
+				   device->card->device) < 0)
 		goto fail_shost_put;
 
 	/* implicit directory ID */