summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-05-18 18:39:39 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2012-05-21 21:42:51 +0200
commit473ffe6560fd5fa5fd5a488e8948899231972bd5 (patch)
tree0c5dd7c1f87105da61fa2568b43b315feb0da00c /drivers/firewire
parentMerge tag 'v3.4' with SCSI updates, needed for subsequent firewire-sbp2 changes (diff)
downloadlinux-473ffe6560fd5fa5fd5a488e8948899231972bd5.tar.xz
linux-473ffe6560fd5fa5fd5a488e8948899231972bd5.zip
firewire: sbp2: give correct DMA device to scsi framework
The sbp2 driver does DMA not on the unit but on the card device. The driver worked even with the wrong device because at the moment, it happens to reimplement the DMA functions of the SCSI framework. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/sbp2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index b7e65d7eab64..2e202d3bf84d 100644
--- a/drivers/firewire/sbp2.c
+++ b/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 */