Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD

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);
                 }
         }