cvbs: clean up bad shift, deadcode, mixed enums errors

PD#150075: driver defect clean up: vdac_dev.c: #5 torvalds#6 torvalds#876 tv_vout.c: torvalds#181 torvalds#267 torvalds#311 torvalds#312 torvalds#313 torvalds#314 torvalds#315 torvalds#532 torvalds#605 Change-Id: I185072efb68df1abdad036a21867bb64efca914c Signed-off-by: Nian Jing <[email protected]>
zuma-array · Nov 4, 2022 · b94e5e2 · b94e5e2
1 parent 47b35c4
commit b94e5e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_out.c b/drivers/amlogic/media/vout/cvbs/cvbs_out.c
@@ -843,6 +843,8 @@ static void cvbs_debug_store(char *buf)
 		}
 
 		func_type_map(argv[1]);
+		if (func_read == NULL)
+			goto DEBUG_END;
 		ret = kstrtoul(argv[2], 16, &addr);
 
 		print_info("read %s[0x%x] = 0x%x\n",
@@ -859,6 +861,8 @@ static void cvbs_debug_store(char *buf)
 		}
 
 		func_type_map(argv[1]);
+		if (func_read == NULL)
+			goto DEBUG_END;
 		ret = kstrtoul(argv[2], 16, &addr);
 		ret = kstrtoul(argv[3], 10, &start);
 		ret = kstrtoul(argv[4], 10, &length);
@@ -885,7 +889,8 @@ static void cvbs_debug_store(char *buf)
 		}
 
 		func_type_map(argv[1]);
-
+		if (func_read == NULL)
+			goto DEBUG_END;
 		ret = kstrtoul(argv[2], 16, &start);
 		ret = kstrtoul(argv[3], 16, &end);
 
@@ -903,7 +908,8 @@ static void cvbs_debug_store(char *buf)
 		}
 
 		func_type_map(argv[2]);
-
+		if (func_write == NULL)
+			goto DEBUG_END;
 		ret = kstrtoul(argv[1], 16, &value);
 		ret = kstrtoul(argv[3], 16, &addr);
 
@@ -921,7 +927,8 @@ static void cvbs_debug_store(char *buf)
 		}
 
 		func_type_map(argv[2]);
-
+		if (func_read == NULL)
+			goto DEBUG_END;
 		ret = kstrtoul(argv[1], 16, &value);
 		ret = kstrtoul(argv[3], 16, &addr);
 		ret = kstrtoul(argv[4], 10, &start);

diff --git a/drivers/amlogic/media/vout/vdac/vdac_dev.c b/drivers/amlogic/media/vout/vdac/vdac_dev.c
@@ -584,7 +584,6 @@ static int aml_vdac_probe(struct platform_device *pdev)
 	cdev_del(&devp->cdev);
 fail_add_cdev:
 	pr_err("%s: add device error\n", __func__);
-	kfree(devp);
 fail_create_class:
 	pr_err("%s: class create error\n", __func__);
 	class_destroy(devp->clsp);
@@ -603,7 +602,6 @@ static int __exit aml_vdac_remove(struct platform_device *pdev)
 	cdev_del(&devp->cdev);
 	class_destroy(devp->clsp);
 	unregister_chrdev_region(devp->devno, 1);
-	kfree(devp);
 	pr_info("%s: amvdac_exit.\n", __func__);
 
 	return 0;