shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: qcom: camss: Fix genpd cleanup

Browse Source 
[ Upstream commit f69791c39745e64621216fe8919cb73c0065002b ]

Right now we never release the power-domains properly on the error path.
Add a routine to be reused for this purpose and appropriate jumps in
probe() to run that routine where necessary.

Fixes: 2f6f8af672 ("media: camss: Refactor VFE power domain toggling")
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bryan O'Donoghue
2023-08-30 16:16:08 +01:00
committed by Greg Kroah-Hartman
parent df5bb7b408
commit 3a14f4fd7b
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/media/platform/qcom/camss/camss.c
View File

@@ -1538,6 +1538,20 @@ static int camss_icc_get(struct camss *camss)
return 0; return 0;
} }
static void camss_genpd_cleanup(struct camss *camss)
{
int i;
if (camss->genpd_num == 1)
return;
if (camss->genpd_num > camss->vfe_num)
device_link_del(camss->genpd_link[camss->genpd_num - 1]);
for (i = 0; i < camss->genpd_num; i++)
dev_pm_domain_detach(camss->genpd[i], true);
}
/* /*
* camss_probe - Probe CAMSS platform device * camss_probe - Probe CAMSS platform device
* @pdev: Pointer to CAMSS platform device * @pdev: Pointer to CAMSS platform device
@@ -1625,11 +1639,11 @@ static int camss_probe(struct platform_device *pdev)
ret = camss_init_subdevices(camss); ret = camss_init_subdevices(camss);
if (ret < 0) if (ret < 0)
return ret; goto err_genpd_cleanup;
ret = dma_set_mask_and_coherent(dev, 0xffffffff); ret = dma_set_mask_and_coherent(dev, 0xffffffff);
if (ret) if (ret)
return ret; goto err_genpd_cleanup;
camss->media_dev.dev = camss->dev; camss->media_dev.dev = camss->dev;
strscpy(camss->media_dev.model, "Qualcomm Camera Subsystem", strscpy(camss->media_dev.model, "Qualcomm Camera Subsystem",
@@ -1641,7 +1655,7 @@ static int camss_probe(struct platform_device *pdev)
ret = v4l2_device_register(camss->dev, &camss->v4l2_dev); ret = v4l2_device_register(camss->dev, &camss->v4l2_dev);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to register V4L2 device: %d\n", ret); dev_err(dev, "Failed to register V4L2 device: %d\n", ret);
return ret; goto err_genpd_cleanup;
} }
v4l2_async_nf_init(&camss->notifier); v4l2_async_nf_init(&camss->notifier);
@@ -1692,28 +1706,19 @@ err_register_subdevs:
err_v4l2_device_unregister: err_v4l2_device_unregister:
v4l2_device_unregister(&camss->v4l2_dev); v4l2_device_unregister(&camss->v4l2_dev);
v4l2_async_nf_cleanup(&camss->notifier); v4l2_async_nf_cleanup(&camss->notifier);
err_genpd_cleanup:
camss_genpd_cleanup(camss);
return ret; return ret;
} }
void camss_delete(struct camss *camss) void camss_delete(struct camss *camss)
{ {
int i;
v4l2_device_unregister(&camss->v4l2_dev); v4l2_device_unregister(&camss->v4l2_dev);
media_device_unregister(&camss->media_dev); media_device_unregister(&camss->media_dev);
media_device_cleanup(&camss->media_dev); media_device_cleanup(&camss->media_dev);
pm_runtime_disable(camss->dev); pm_runtime_disable(camss->dev);
if (camss->genpd_num == 1)
return;
if (camss->genpd_num > camss->vfe_num)
device_link_del(camss->genpd_link[camss->genpd_num - 1]);
for (i = 0; i < camss->genpd_num; i++)
dev_pm_domain_detach(camss->genpd[i], true);
} }
/* /*
@@ -1732,6 +1737,8 @@ static void camss_remove(struct platform_device *pdev)
if (atomic_read(&camss->ref_count) == 0) if (atomic_read(&camss->ref_count) == 0)
camss_delete(camss); camss_delete(camss);
camss_genpd_cleanup(camss);
} }
static const struct of_device_id camss_dt_match[] = { static const struct of_device_id camss_dt_match[] = {