From 2d32d10103bc94ad2461864664b61ea98c930619 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 15 May 2015 12:24:15 +0300 Subject: ata: ahci_xgene: potential NULL dereference in probe Smatch complains about this potential NULL dereference of "acpi_id". Fixes: c9802a4be661 ('ata: ahci_xgene: Add AHCI Support for 2nd HW version of APM X-Gene SoC AHCI SATA Host controller.') Signed-off-by: Dan Carpenter Signed-off-by: Tejun Heo --- drivers/ata/ahci_xgene.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/ata') diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index 2add250d1555..e2c6d9e0c5ac 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -732,9 +732,7 @@ static int xgene_ahci_probe(struct platform_device *pdev) if (!acpi_id) { dev_warn(&pdev->dev, "No node entry in ACPI table. Assume version1\n"); version = XGENE_AHCI_V1; - } - - if (acpi_id->driver_data) { + } else if (acpi_id->driver_data) { version = (enum xgene_ahci_version) acpi_id->driver_data; status = acpi_get_object_info(ACPI_HANDLE(&pdev->dev), &info); if (ACPI_FAILURE(status)) { -- cgit v1.2.1