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

Commit afa3dfd4 authored by Subhash Jadavani's avatar Subhash Jadavani Committed by Martin K. Petersen
Browse files

scsi: ufshcd: release resources if probe fails 



If ufshcd pltfrm/pci driver's probe fails for some reason then ensure
that scsi host is released to avoid memory leak but managed memory
allocations (via devm_* calls) need not to be freed explicitly on probe
failure as memory allocated with these functions is automatically freed
on driver detach.

Reviewed-by: default avatarSahitya Tummala <stummala@codeaurora.org>
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 30fc33f1

drivers/scsi/ufs/ufshcd-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) 
	pm_runtime_forbid(&pdev->dev);

	pm_runtime_get_noresume(&pdev->dev);

	ufshcd_remove(hba);

	ufshcd_dealloc_host(hba);

}



/**
@@ -147,6 +148,7 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	err = ufshcd_init(hba, mmio_base, pdev->irq);

	if (err) {

		dev_err(&pdev->dev, "Initialization failed\n");

		ufshcd_dealloc_host(hba);

		return err;

	}

drivers/scsi/ufs/ufshcd-pltfrm.c

+1 −4
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, 
	if (ret) {

		dev_err(dev, "%s: unable to find %s err %d\n",

				__func__, prop_name, ret);

		goto out_free;

		goto out;

	}



	vreg->min_uA = 0;
@@ -185,9 +185,6 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, 


	goto out;



out_free:

	devm_kfree(dev, vreg);

	vreg = NULL;

out:

	if (!ret)

		*out_vreg = vreg;

drivers/scsi/ufs/ufshcd.c

+0 −3
Original line number Diff line number Diff line
@@ -6253,8 +6253,6 @@ void ufshcd_remove(struct ufs_hba *hba) 
	ufshcd_disable_intr(hba, hba->intr_mask);

	ufshcd_hba_stop(hba, true);



	scsi_host_put(hba->host);



	ufshcd_exit_clk_gating(hba);

	if (ufshcd_is_clkscaling_enabled(hba))

		devfreq_remove_device(hba->devfreq);
@@ -6616,7 +6614,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
	ufshcd_exit_clk_gating(hba);

out_disable:

	hba->is_irq_enabled = false;

	scsi_host_put(host);

	ufshcd_hba_exit(hba);

out_error:

	return err;