diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-02-16 15:41:38 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-02-16 15:41:38 +0100 |
| commit | 15465409746166c4c2f81845db0c10de947f08e4 (patch) | |
| tree | 520bd0e0abfaf6149b5e51c4c146378b34353321 /drivers/ieee1394 | |
| parent | e80de3704ac30ddb7f9a12447a2ecee32ccd7880 (diff) | |
| parent | 779a35c8596ab98a4e443cd3ac8598d4e11415b7 (diff) | |
Merge branches 'master' and 'post-2.6.25' into for-mm
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/csr.c | 6 | ||||
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c index 52ac83e0ebee..c90be4070e40 100644 --- a/drivers/ieee1394/csr.c +++ b/drivers/ieee1394/csr.c @@ -133,8 +133,7 @@ static void host_reset(struct hpsb_host *host) host->csr.state &= ~0x100; } - host->csr.topology_map[1] = - cpu_to_be32(be32_to_cpu(host->csr.topology_map[1]) + 1); + be32_add_cpu(&host->csr.topology_map[1], 1); host->csr.topology_map[2] = cpu_to_be32(host->node_count << 16 | host->selfid_count); host->csr.topology_map[0] = @@ -142,8 +141,7 @@ static void host_reset(struct hpsb_host *host) | csr_crc16(host->csr.topology_map + 1, host->selfid_count + 2)); - host->csr.speed_map[1] = - cpu_to_be32(be32_to_cpu(host->csr.speed_map[1]) + 1); + be32_add_cpu(&host->csr.speed_map[1], 1); host->csr.speed_map[0] = cpu_to_be32(0x3f1 << 16 | csr_crc16(host->csr.speed_map+1, 0x3f1)); diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index accb2ad8b561..9a6db063e587 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -1977,11 +1977,8 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) lu->sdev = sdev; sdev->allow_restart = 1; - /* - * Update the dma alignment (minimum alignment requirements for - * start and end of DMA transfers) to be a sector - */ - blk_queue_update_dma_alignment(sdev->request_queue, 511); + /* SBP-2 requires quadlet alignment of the data buffers. */ + blk_queue_update_dma_alignment(sdev->request_queue, 4 - 1); if (lu->workarounds & SBP2_WORKAROUND_INQUIRY_36) sdev->inquiry_len = 36; |