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

media: rockchip: vicap fix error state about get clk/rst

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4e19314f273f9d7077d9067c32d13c030b95dffc
This commit is contained in:
Zefa Chen
2022-12-20 16:16:50 +08:00
committed by Tao Huang
parent 62c5f6364d
commit 4bd12e6711
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/cif/Kconfig
View File

@@ -5,8 +5,8 @@ config VIDEO_ROCKCHIP_CIF
depends on ARCH_ROCKCHIP || COMPILE_TEST
depends on MEDIA_CAMERA_SUPPORT
select VIDEOBUF2_CMA_SG
select VIDEOBUF2_VMALLOC
select V4L2_FWNODE
select PHY_ROCKCHIP_MIPI_RX
default n
help
Support for CIF on the rockchip SoCs like rk312x, rk3288.

5
drivers/media/platform/rockchip/cif/hw.c
View File

@@ -1233,10 +1233,11 @@ static int rkcif_plat_hw_probe(struct platform_device *pdev)
if (data->rsts[i])
rst = devm_reset_control_get(dev, data->rsts[i]);
if (IS_ERR(rst)) {
cif_hw->cif_rst[i] = NULL;
dev_err(dev, "failed to get %s\n", data->rsts[i]);
return PTR_ERR(rst);
} else {
cif_hw->cif_rst[i] = rst;
}
cif_hw->cif_rst[i] = rst;
}
cif_hw->cif_regs = data->cif_regs;

6
drivers/media/platform/rockchip/cif/mipi-csi2.c
View File

@@ -979,14 +979,16 @@ static int csi2_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, &csi2->sd);
csi2->clks_num = devm_clk_bulk_get_all(dev, &csi2->clks_bulk);
if (csi2->clks_num < 0)
if (csi2->clks_num < 0) {
csi2->clks_num = 0;
dev_err(dev, "failed to get csi2 clks\n");
}
csi2->rsts_bulk = devm_reset_control_array_get_optional_exclusive(dev);
if (IS_ERR(csi2->rsts_bulk)) {
if (PTR_ERR(csi2->rsts_bulk) != -EPROBE_DEFER)
dev_err(dev, "failed to get csi2 reset\n");
return PTR_ERR(csi2->rsts_bulk);
csi2->rsts_bulk = NULL;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);