Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
index 0ec5abdba5c4..29e52d7c61c0 100644
--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
+++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
@@ -1149,12 +1149,13 @@ int msm_edp_ctrl_init(struct msm_edp *edp)
         ctrl->aux = msm_edp_aux_init(dev, ctrl->base, &ctrl->drm_aux);
         if (!ctrl->aux || !ctrl->drm_aux) {
                 pr_err("%s:failed to init aux\n", __func__);
-                return ret;
+                return -ENOMEM;
         }
 
         ctrl->phy = msm_edp_phy_init(dev, ctrl->base);
         if (!ctrl->phy) {
                 pr_err("%s:failed to init phy\n", __func__);
+                ret = -ENOMEM;
                 goto err_destory_aux;
         }