Merge branch 'dipm-fix' into upstream-fixes

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 61535e72834dcf79403a222c6875d95cafea619a..304825b1c977ddacf25c81588975a4ea46a490b2 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -425,6 +425,8 @@ static inline int ata_id_has_lba48(const u16 *id)
 {
        if ((id[83] & 0xC000) != 0x4000)
                return 0;
+       if (!ata_id_u64(id, 100))
+               return 0;
        return id[83] & (1 << 10);
 }