diff --git a/[refs] b/[refs]
index 30253ba2e32d..814dcf6c025b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc496ed00ab1411d3efaf295b72e0c9eb343e1a3
+refs/heads/master: f7acede65d6b65919aee5b6a360a17cedb11f2f7
diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h
index 38a6948ce0c2..20f31567ccee 100644
--- a/trunk/include/linux/ata.h
+++ b/trunk/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)