aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/libata-scsi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 08:55:00 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 08:55:00 -0700
commitad542ef5b2296fa7a8518e6be67c4588b750d316 (patch)
treee039ed07c5cd2163dee880cb7970a70333c532aa /drivers/scsi/libata-scsi.c
parentff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff)
parentf3ac91cf521be4637236d2dcb7ad4aa91f8865f0 (diff)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-2.6.git
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r--drivers/scsi/libata-scsi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 4c96df060c3..416ba67ba9e 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -347,7 +347,10 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
*/
if ((dev->flags & ATA_DFLAG_LBA48) &&
((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) {
- sdev->host->max_sectors = 2048;
+ /*
+ * do not overwrite sdev->host->max_sectors, since
+ * other drives on this host may not support LBA48
+ */
blk_queue_max_sectors(sdev->request_queue, 2048);
}
}