Merge "msm: mdss: fix to return error when overlay get/set fail" (fee0fb84) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_compat_utils.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -2659,11 +2659,15 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
		}
		ov32 = compat_ptr(arg);
		ret = __from_user_mdp_overlay(ov, ov32);
		if (ret)

		if (ret) {
		pr_err("%s: compat mdp overlay failed\n", __func__);
		else
		} else {
		ret = mdss_fb_do_ioctl(info, cmd, (unsigned long) ov);

		if (!ret)
		ret = __to_user_mdp_overlay(ov32, ov);
		}
		break;
		case MSMFB_OVERLAY_SET:
		ov = compat_alloc_user_space(sizeof(*ov));
		@@ -2678,6 +2682,8 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
		pr_err("%s: compat mdp overlay failed\n", __func__);
		} else {
		ret = mdss_fb_do_ioctl(info, cmd, (unsigned long) ov);

		if (!ret)
		ret = __to_user_mdp_overlay(ov32, ov);
		}
		break;