X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fata%2Fahci_xgene.c;h=e916bff6cee871fa69ac1107e7bf13f12b0ebdef;hb=0088faa3f81e3638ec655678a7f476cf5653b6df;hp=e2c6d9e0c5ac5ce5ce389b0ae1b0597ae979ee8b;hpb=2d28b633c3fa8f53b919a5de86eb1c8e78dde818;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index e2c6d9e0c5ac..e916bff6cee8 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -739,9 +739,9 @@ static int xgene_ahci_probe(struct platform_device *pdev)
 				dev_warn(&pdev->dev, "%s: Error reading device info. Assume version1\n",
 					__func__);
 				version = XGENE_AHCI_V1;
-			}
-			if (info->valid & ACPI_VALID_CID)
+			} else if (info->valid & ACPI_VALID_CID) {
 				version = XGENE_AHCI_V2;
+			}
 		}
 	}
 #endif