Merge 4b1e1116a0 on remote branch

Change-Id: I4db3d7111edce5025bbc87a2808c33735da0610d
This commit is contained in:
Linux Build Service Account 2024-11-12 05:43:08 -08:00
commit 877f9bf439

View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/
@ -5971,15 +5971,25 @@ static int dsi_display_init(struct dsi_display *display)
if (rc) {
DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
display->panel->name, rc);
return rc;
goto vreg_fail;
}
}
rc = component_add(&pdev->dev, &dsi_display_comp_ops);
if (rc)
if (rc) {
DSI_ERR("component add failed, rc=%d\n", rc);
goto comp_add_fail;
}
DSI_DEBUG("component add success: %s\n", display->name);
return rc;
comp_add_fail:
if (display->panel)
dsi_pwr_enable_regulator(&display->panel->power_info, false);
vreg_fail:
_dsi_display_dev_deinit(display);
end:
return rc;
}