Merge "msm: mdss: compat: avoid overrwriting err code from ioctl"

Sandbox-125 · Apr 24, 2014 · 35188fa · 35188fa
2 parents 0534c67 + 29acad3
commit 35188fa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/video/msm/mdss/mdss_compat_utils.c b/drivers/video/msm/mdss/mdss_compat_utils.c
@@ -2513,8 +2513,9 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
 		} else {
 			ret = mdss_fb_do_ioctl(info, cmd,
 						(unsigned long) ovlist);
-			ret = __to_user_mdp_overlaylist(ovlist32, ovlist,
-						layers_head);
+			if (!ret)
+				ret = __to_user_mdp_overlaylist(ovlist32,
+							 ovlist, layers_head);
 		}
 		break;
 	case MSMFB_OVERLAY_UNSET: