UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Subhash Jadavani 2016-10-27 17:25:58 -07:00 committed by Martin K. Petersen
parent 30fc33f1ef
commit afa3dfd42d
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/ufs/ufshcd-pci.c
View File

@ -104,6 +104,7 @@ static void ufshcd_pci_remove(struct pci_dev *pdev)
pm_runtime_forbid(&pdev->dev); pm_runtime_forbid(&pdev->dev);
pm_runtime_get_noresume(&pdev->dev); pm_runtime_get_noresume(&pdev->dev);
ufshcd_remove(hba); 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); err = ufshcd_init(hba, mmio_base, pdev->irq);
if (err) { if (err) {
dev_err(&pdev->dev, "Initialization failed\n"); dev_err(&pdev->dev, "Initialization failed\n");
ufshcd_dealloc_host(hba);
return err; return err;
} }

5
drivers/scsi/ufs/ufshcd-pltfrm.c
View File

@ -163,7 +163,7 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name,
if (ret) { if (ret) {
dev_err(dev, "%s: unable to find %s err %d\n", dev_err(dev, "%s: unable to find %s err %d\n",
__func__, prop_name, ret); __func__, prop_name, ret);
goto out_free; goto out;
} }
vreg->min_uA = 0; vreg->min_uA = 0;
@ -185,9 +185,6 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name,
goto out; goto out;
out_free:
devm_kfree(dev, vreg);
vreg = NULL;
out: out:
if (!ret) if (!ret)
*out_vreg = vreg; *out_vreg = vreg;

3
drivers/scsi/ufs/ufshcd.c
View File

@ -6253,8 +6253,6 @@ void ufshcd_remove(struct ufs_hba *hba)
ufshcd_disable_intr(hba, hba->intr_mask); ufshcd_disable_intr(hba, hba->intr_mask);
ufshcd_hba_stop(hba, true); ufshcd_hba_stop(hba, true);
scsi_host_put(hba->host);
ufshcd_exit_clk_gating(hba); ufshcd_exit_clk_gating(hba);
if (ufshcd_is_clkscaling_enabled(hba)) if (ufshcd_is_clkscaling_enabled(hba))
devfreq_remove_device(hba->devfreq); devfreq_remove_device(hba->devfreq);
@ -6616,7 +6614,6 @@ exit_gating:
ufshcd_exit_clk_gating(hba); ufshcd_exit_clk_gating(hba);
out_disable: out_disable:
hba->is_irq_enabled = false; hba->is_irq_enabled = false;
scsi_host_put(host);
ufshcd_hba_exit(hba); ufshcd_hba_exit(hba);
out_error: out_error:
return err; return err;