public inbox for linux-ide@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ata: ahci_xgene: free structure returned by acpi_get_object_info()
@ 2017-01-05 14:14 Michał Kępień
  2017-01-06 16:39 ` Tejun Heo
  0 siblings, 1 reply; 2+ messages in thread
From: Michał Kępień @ 2017-01-05 14:14 UTC (permalink / raw)
  To: Tejun Heo; +Cc: linux-ide, linux-kernel

acpi_get_object_info() allocates the returned structure, which the
caller has to free when the call succeeds.  Free it when appropriate.

Fixes: c9802a4be661 ("ata: ahci_xgene: Add AHCI Support for 2nd HW version of APM X-Gene SoC AHCI SATA Host controller.")
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
 drivers/ata/ahci_xgene.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index 73b19b277138..c2b5941d9184 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -821,8 +821,10 @@ 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;
-			} else if (info->valid & ACPI_VALID_CID) {
-				version = XGENE_AHCI_V2;
+			} else {
+				if (info->valid & ACPI_VALID_CID)
+					version = XGENE_AHCI_V2;
+				kfree(info);
 			}
 		}
 	}
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ata: ahci_xgene: free structure returned by acpi_get_object_info()
  2017-01-05 14:14 [PATCH] ata: ahci_xgene: free structure returned by acpi_get_object_info() Michał Kępień
@ 2017-01-06 16:39 ` Tejun Heo
  0 siblings, 0 replies; 2+ messages in thread
From: Tejun Heo @ 2017-01-06 16:39 UTC (permalink / raw)
  To: Michał Kępień; +Cc: linux-ide, linux-kernel

On Thu, Jan 05, 2017 at 03:14:01PM +0100, Michał Kępień wrote:
> acpi_get_object_info() allocates the returned structure, which the
> caller has to free when the call succeeds.  Free it when appropriate.
> 
> Fixes: c9802a4be661 ("ata: ahci_xgene: Add AHCI Support for 2nd HW version of APM X-Gene SoC AHCI SATA Host controller.")
> Signed-off-by: Michał Kępień <kernel@kempniu.pl>

Applied to libata/for-4.11.

Thanks.

-- 
tejun

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-01-06 16:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-05 14:14 [PATCH] ata: ahci_xgene: free structure returned by acpi_get_object_info() Michał Kępień
2017-01-06 16:39 ` Tejun Heo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox