diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-08-04 18:39:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-08-09 14:27:42 -0700 |
| commit | 5823d303986dcad51048d94a523216dd65276424 (patch) | |
| tree | 2857cea2772388f885aa8235d6aa1da4f07ac402 | |
| parent | d1901fd4f996b18045de60d44b934ce097f699c0 (diff) | |
| download | lwn-5823d303986dcad51048d94a523216dd65276424.tar.gz lwn-5823d303986dcad51048d94a523216dd65276424.zip | |
ieee1394: revert "sbp2: enforce 32bit DMA mapping"
Revert commit 0555659d63c285ceb7ead3115532e1b71b0f27a7 from 2.6.22-rc1.
The dma_set_mask call somehow failed on a PowerMac G5, PPC64:
http://lkml.org/lkml/2007/8/1/344
Should there ever occur a DMA mapping beyond the physical DMA range, a
proper SBP-2 firmware will report transport errors. So let's leave it
at that.
Same as commit a9c2f18800753c82c45fc13b27bdc148849bdbb2.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Tested-by: Olaf Hering <olh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 3f873cc7e247..c7ff28abf9af 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -774,11 +774,6 @@ static struct sbp2_lu *sbp2_alloc_device(struct unit_directory *ud) SBP2_ERR("failed to register lower 4GB address range"); goto failed_alloc; } -#else - if (dma_set_mask(hi->host->device.parent, DMA_32BIT_MASK)) { - SBP2_ERR("failed to set 4GB DMA mask"); - goto failed_alloc; - } #endif } |