diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:27:47 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:27:47 -0400 |
commit | 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 (patch) | |
tree | ae03881d6d86b528e075f7b6af8af74f4dbbf9ec /drivers/scsi/libata-scsi.c | |
parent | efa6e7e9d40fe01406d889a5bed62f2e0da49bff (diff) | |
parent | 9a375e93f88269bb770fb2eaa57554c975449c88 (diff) |
Merge branch 'max-sect' into upstream
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r-- | drivers/scsi/libata-scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 996058af1bcd..f036ae4b8afb 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
@@ -670,7 +670,7 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, | |||
670 | */ | 670 | */ |
671 | max_sectors = ATA_MAX_SECTORS; | 671 | max_sectors = ATA_MAX_SECTORS; |
672 | if (dev->flags & ATA_DFLAG_LBA48) | 672 | if (dev->flags & ATA_DFLAG_LBA48) |
673 | max_sectors = 2048; | 673 | max_sectors = ATA_MAX_SECTORS_LBA48; |
674 | if (dev->max_sectors) | 674 | if (dev->max_sectors) |
675 | max_sectors = dev->max_sectors; | 675 | max_sectors = dev->max_sectors; |
676 | 676 | ||