3 files changed, 18 insertions, 3 deletions

diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index 1a50cd3b4233..9b34dff64536 100644
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -216,12 +216,16 @@ static int ahci_da850_probe(struct platform_device *pdev)
                 return rc;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (!res)
+        if (!res) {
+                rc = -ENODEV;
                 goto disable_resources;
+        }
 
         pwrdn_reg = devm_ioremap(dev, res->start, resource_size(res));
-        if (!pwrdn_reg)
+        if (!pwrdn_reg) {
+                rc = -ENOMEM;
                 goto disable_resources;
+        }
 
         da850_sata_init(dev, pwrdn_reg, hpriv->mmio, mpy);
 
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index fa7dd4394c02..1945a8ea2099 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2411,6 +2411,9 @@ static void ata_dev_config_trusted(struct ata_device *dev)
         u64 trusted_cap;
         unsigned int err;
 
+        if (!ata_id_has_trusted(dev->id))
+                return;
+
         if (!ata_identify_page_supported(dev, ATA_LOG_SECURITY)) {
                 ata_dev_warn(dev,
                              "Security Log not supported\n");
diff --git a/include/linux/ata.h b/include/linux/ata.h
index e65ae4b2ed48..c7a353825450 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -60,7 +60,8 @@ enum {
         ATA_ID_FW_REV           = 23,
         ATA_ID_PROD             = 27,
         ATA_ID_MAX_MULTSECT     = 47,
-        ATA_ID_DWORD_IO         = 48,
+        ATA_ID_DWORD_IO         = 48,   /* before ATA-8 */
+        ATA_ID_TRUSTED          = 48,   /* ATA-8 and later */
         ATA_ID_CAPABILITY       = 49,
         ATA_ID_OLD_PIO_MODES    = 51,
         ATA_ID_OLD_DMA_MODES    = 52,
@@ -889,6 +890,13 @@ static inline bool ata_id_has_dword_io(const u16 *id)
         return id[ATA_ID_DWORD_IO] & (1 << 0);
 }
 
+static inline bool ata_id_has_trusted(const u16 *id)
+{
+        if (ata_id_major_version(id) <= 7)
+                return false;
+        return id[ATA_ID_TRUSTED] & (1 << 0);
+}
+
 static inline bool ata_id_has_unload(const u16 *id)
 {
         if (ata_id_major_version(id) >= 7 &&