diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 07:58:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 07:58:21 -0800 |
| commit | 56dca4ceb7b39aa4173aa1cb822c860ced2be1ec (patch) | |
| tree | 8e20946b7247aa32a83619b481f83efe335e7da0 /include | |
| parent | CS5536: apply pci quirk for BIOS SMBUS bug (diff) | |
| parent | [libata] Call flush_dcache_page after PIO data transfers in libata-sff.c (diff) | |
| download | linux-dev-56dca4ceb7b39aa4173aa1cb822c860ced2be1ec.tar.xz linux-dev-56dca4ceb7b39aa4173aa1cb822c860ced2be1ec.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] Call flush_dcache_page after PIO data transfers in libata-sff.c
ahci: add Acer G725 to broken suspend list
libata: fix ata_id_logical_per_physical_sectors
libata-scsi passthru: fix bug which truncated LBA48 return values
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 38a6948ce0c2..20f31567ccee 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -647,9 +647,9 @@ static inline int ata_id_has_large_logical_sectors(const u16 *id) return id[ATA_ID_SECTOR_SIZE] & (1 << 13); } -static inline u8 ata_id_logical_per_physical_sectors(const u16 *id) +static inline u16 ata_id_logical_per_physical_sectors(const u16 *id) { - return id[ATA_ID_SECTOR_SIZE] & 0xf; + return 1 << (id[ATA_ID_SECTOR_SIZE] & 0xf); } static inline int ata_id_has_lba48(const u16 *id) |