1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index f53f72daae34..5f713a01f044 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1985,11 +1985,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;