diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 01:47:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 01:47:10 -0400 |
| commit | 949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch) | |
| tree | ca88fd8f8f81b167dc4685ed34e9636f267db60d /drivers/scsi/libata-scsi.c | |
| parent | b095518ef51c37658c58367bd19240b8a113f25c (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
| download | kernel_samsung_smdk4412-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.gz kernel_samsung_smdk4412-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.bz2 kernel_samsung_smdk4412-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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 22c77a11353..072b6e5b139 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); } } |