Merge "video: driver: Avoided video_xo_reset on MILOS"

This commit is contained in:
qctecmdr
2024-03-16 13:17:58 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/sort.h> #include <linux/sort.h>
@@ -1489,9 +1489,13 @@ static int __reset_control_acquire_name(struct msm_vidc_core *core,
__func__, rcinfo->name); __func__, rcinfo->name);
break; break;
} }
/* Faced this issue for volcano which doesn't support xo_reset
* skip this check and return success
*/
if (!found) { if (!found) {
d_vpr_e("%s: reset control (%s) not found\n", __func__, name); d_vpr_e("%s: reset control (%s) not found but returning success\n",
rc = -EINVAL; __func__, name);
rc = 0;
} }
return rc; return rc;
@@ -1530,9 +1534,13 @@ static int __reset_control_release_name(struct msm_vidc_core *core,
__func__, rcinfo->name); __func__, rcinfo->name);
break; break;
} }
/* Faced this issue for volcano which doesn't support xo_reset
* skip this check and return success
*/
if (!found) { if (!found) {
d_vpr_e("%s: reset control (%s) not found\n", __func__, name); d_vpr_e("%s: reset control (%s) not found but returning success\n",
rc = -EINVAL; __func__, name);
rc = 0;
} }
return rc; return rc;