summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-scsi.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-26 07:47:10 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-05-26 07:47:10 +0200
commit949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch)
treeca88fd8f8f81b167dc4685ed34e9636f267db60d /drivers/scsi/libata-scsi.c
parent[libata] ATA passthru (arbitrary ATA command execution) (diff)
parentMerge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.xz
linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.zip
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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 22c77a113536..072b6e5b139e 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -625,7 +625,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);
}
}