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

media: rockchip: cif: detach hw device when probe failure

Browse Source 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ibaa4a4d2cb41fe154a1bd02b6ac459ce29380663
This commit is contained in:
Hu Kejun
2020-09-02 12:02:39 +08:00
committed by Tao Huang
parent 6768f5febc
commit b73d8332ac
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/platform/rockchip/cif/dev.c
View File

@@ -695,6 +695,29 @@ int rkcif_attach_hw(struct rkcif_device *cif_dev)
return 0;
}
static int rkcif_detach_hw(struct rkcif_device *cif_dev)
{
struct rkcif_hw *hw = cif_dev->hw_dev;
int i;
for (i = 0; i < hw->dev_num; i++) {
if (hw->cif_dev[i] == cif_dev) {
if ((i + 1) < hw->dev_num) {
hw->cif_dev[i] = hw->cif_dev[i + 1];
hw->cif_dev[i + 1] = NULL;
} else {
hw->cif_dev[i] = NULL;
}
hw->dev_num--;
dev_info(cif_dev->dev, "detach to cif hw node\n");
break;
}
}
return 0;
}
int rkcif_plat_init(struct rkcif_device *cif_dev, struct device_node *node, int inf_id)
{
struct device *dev = cif_dev->dev;
@@ -853,8 +876,10 @@ static int rkcif_plat_probe(struct platform_device *pdev)
}
ret = rkcif_plat_init(cif_dev, node, data->inf_id);
if (ret)
if (ret) {
rkcif_detach_hw(cif_dev);
return ret;
}
rkcif_soft_reset(cif_dev, true);
pm_runtime_enable(&pdev->dev);
@@ -866,7 +891,9 @@ static int rkcif_plat_remove(struct platform_device *pdev)
{
struct rkcif_device *cif_dev = platform_get_drvdata(pdev);
return rkcif_plat_uninit(cif_dev);
rkcif_plat_uninit(cif_dev);
rkcif_detach_hw(cif_dev);
return 0;
}
static int __maybe_unused rkcif_runtime_suspend(struct device *dev)