aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-05 07:58:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-05 07:58:21 -0800
commit56dca4ceb7b39aa4173aa1cb822c860ced2be1ec (patch)
tree8e20946b7247aa32a83619b481f83efe335e7da0 /include
parent73d2eaac8a3f1ec1d6d0a80ea7302a439ca9b933 (diff)
parent2d68b7fe55d9e19a8a868224ed0dfd6526568521 (diff)
downloadlinux-linaro-android-56dca4ceb7b39aa4173aa1cb822c860ced2be1ec.tar.gz
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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 38a6948ce0c..20f31567cce 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)