camera: camsys_drv:v0.0x1b.0 oneframe:v0.1.0xd

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / rk_camsys / camsys_drv.c

diff --git a/drivers/media/video/rk_camsys/camsys_drv.c b/drivers/media/video/rk_camsys/camsys_drv.c
index 4232b242d8530c8dd38d964d1ecbf2a822459924..d9e0e35b3a653d08462e1b164a107563e9d1bd37 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_drv.c
+++ b/drivers/media/video/rk_camsys/camsys_drv.c
@@ -814,10 +814,11 @@ static long camsys_ioctl(struct file *filp,unsigned int cmd, unsigned long arg)
             #ifdef CONFIG_ROCKCHIP_IOMMU
                                struct device_node * vpu_node =NULL;
                                int vpu_iommu_enabled = 0;
-                vpu_node = of_find_compatible_node(NULL,NULL, "rockchip,vpu_sub");
+                vpu_node = of_find_node_by_name(NULL, "vpu_service");
                                if(vpu_node){
                                        of_property_read_u32(vpu_node, "iommu_enabled", &vpu_iommu_enabled);
                                        of_property_read_u32(camsys_dev->pdev->dev.of_node, "rockchip,isp,iommu_enable", &iommu_enabled);
+                                       of_node_put(vpu_node);
                                        if(iommu_enabled != vpu_iommu_enabled){
                                                camsys_err("iommu status not consistent,check the dts file ! isp:%d,vpu:%d",iommu_enabled,vpu_iommu_enabled);
                                                return -EFAULT;