Merge "voice_svc: Avoid double free in voice_svc driver" (8ee90c66) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/qdsp6v2/voice_svc.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ static int voice_svc_probe(struct platform_device *pdev)
		if (ret) {
		pr_err("%s: Failed to alloc chrdev\n", __func__);
		ret = -ENODEV;
		goto chrdev_err;
		goto done;
		}

		voice_svc_dev->major = MAJOR(device_num);
		@@ -820,8 +820,6 @@ dev_err:
		class_destroy(voice_svc_class);
		class_err:
		unregister_chrdev_region(0, MINOR_NUMBER);
		chrdev_err:
		kfree(voice_svc_dev);
		done:
		return ret;
		}
		@@ -835,7 +833,6 @@ static int voice_svc_remove(struct platform_device *pdev)
		device_destroy(voice_svc_class, device_num);
		class_destroy(voice_svc_class);
		unregister_chrdev_region(0, MINOR_NUMBER);
		kfree(voice_svc_dev);

		return 0;
		}