Merge "fbdev: msm: Handle rotator init failure correctly" (b4719903) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/video/fbdev/msm/mdss_rotator.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -2223,14 +2223,16 @@ static int mdss_rotator_handle_request(struct mdss_rot_mgr *mgr,
		ret = copy_from_user(items, user_req.list, size);
		if (ret) {
		pr_err("fail to copy rotation items\n");
		goto handle_request_err;
		kfree(items);
		return ret;
		}

		req = mdss_rotator_req_init(mgr, items, user_req.count, user_req.flags);
		if (IS_ERR_OR_NULL(req)) {
		pr_err("fail to allocate rotation request\n");
		ret = PTR_ERR(req);
		goto handle_request_err;
		kfree(items);
		return ret;
		}

		mutex_lock(&mgr->lock);
		@@ -2269,7 +2271,6 @@ static int mdss_rotator_handle_request(struct mdss_rot_mgr *mgr,

		handle_request_err1:
		mutex_unlock(&mgr->lock);
		handle_request_err:
		kfree(items);
		kfree(req);
		return ret;
		@@ -2388,7 +2389,8 @@ static int mdss_rotator_handle_request32(struct mdss_rot_mgr *mgr,
		ret = copy_from_user(items, compat_ptr(user_req32.list), size);
		if (ret) {
		pr_err("fail to copy rotation items\n");
		goto handle_request32_err;
		kfree(items);
		return ret;
		}

		req = mdss_rotator_req_init(mgr, items, user_req32.count,
		@@ -2396,7 +2398,8 @@ static int mdss_rotator_handle_request32(struct mdss_rot_mgr *mgr,
		if (IS_ERR_OR_NULL(req)) {
		pr_err("fail to allocate rotation request\n");
		ret = PTR_ERR(req);
		goto handle_request32_err;
		kfree(items);
		return ret;
		}

		mutex_lock(&mgr->lock);
		@@ -2435,7 +2438,6 @@ static int mdss_rotator_handle_request32(struct mdss_rot_mgr *mgr,

		handle_request32_err1:
		mutex_unlock(&mgr->lock);
		handle_request32_err:
		kfree(items);
		kfree(req);
		return ret;