Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

[~andy/linux] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 38a6948ce0c2cd7a50917c1a82570d851196f053..b4c85e2adef5e494d76a1c9a670ad22111e5c85b 100644 (file)
--- 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)
@@ -841,7 +841,8 @@ static inline int ata_id_current_chs_valid(const u16 *id)
 
 static inline int ata_id_is_cfa(const u16 *id)
 {
-       if (id[ATA_ID_CONFIG] == 0x848A)        /* Traditional CF */
+       if ((id[ATA_ID_CONFIG] == 0x848A) ||    /* Traditional CF */
+           (id[ATA_ID_CONFIG] == 0x844A))      /* Delkin Devices CF */
                return 1;
        /*
         * CF specs don't require specific value in the word 0 anymore and yet