summaryrefslogtreecommitdiff
path: root/drivers/ieee1394/sbp2.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-02-28 18:41:12 (GMT)
committerJens Axboe <jens.axboe@oracle.com>2010-02-28 18:41:12 (GMT)
commit6fc2de06ef1e691d032aa572478c905b7495a274 (patch)
tree778df1440b045d67c997d7bd79ee3c6c11f57638 /drivers/ieee1394/sbp2.c
parent58c24a61614f5da290068e47fc5ec65370eb61dd (diff)
parent8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff)
downloadlinux-6fc2de06ef1e691d032aa572478c905b7495a274.tar.xz
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/ieee1394/sbp2.c')
-rw-r--r--drivers/ieee1394/sbp2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index f199896..c88696a 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -2020,7 +2020,7 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
if (lu->workarounds & SBP2_WORKAROUND_POWER_CONDITION)
sdev->start_stop_pwr_cond = 1;
if (lu->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
- blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
+ blk_queue_max_hw_sectors(sdev->request_queue, 128 * 1024 / 512);
blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
return 0;