Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ba9488 authored by Corentin Labbe's avatar Corentin Labbe Committed by Tejun Heo
Browse files

Revert "ata: ahci_platform: convert kcalloc to devm_kcalloc" 



Since ahci_platform_put_resources() use target_pwrs after "devm_" freed
it, we cannot use devm_kcalloc for allocating target_pwrs.

This reverts commit bd0038b1.

Reported-and-reviwed-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Tested-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 1ecd34dd

drivers/ata/libahci_platform.c

+7 −1
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ static void ahci_platform_put_resources(struct device *dev, void *res) 
	for (c = 0; c < hpriv->nports; c++)

		if (hpriv->target_pwrs && hpriv->target_pwrs[c])

			regulator_put(hpriv->target_pwrs[c]);



	kfree(hpriv->target_pwrs);

}



static int ahci_platform_get_phy(struct ahci_host_priv *hpriv, u32 port,
@@ -406,7 +408,11 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev) 
		rc = -ENOMEM;

		goto err_out;

	}

	hpriv->target_pwrs = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->target_pwrs), GFP_KERNEL);

	/*

	 * We cannot use devm_ here, since ahci_platform_put_resources() uses

	 * target_pwrs after devm_ have freed memory

	 */

	hpriv->target_pwrs = kcalloc(hpriv->nports, sizeof(*hpriv->target_pwrs), GFP_KERNEL);

	if (!hpriv->target_pwrs) {

		rc = -ENOMEM;

		goto err_out;