Merge "asoc: msm_sdw: Revert adsp ready check for read/write" (12f3c1c5) · Commits · e / devices / android_kernel_oneplus_sm7250

asoc/codecs/msm_sdw/msm_sdw_cdc.c

+3 −5

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2018, 2020-2021, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -328,8 +328,7 @@ static int msm_sdw_ahb_write_device(struct msm_sdw_priv *msm_sdw,
		{
		u32 temp = (u32)(*value) & 0x000000FF;

		if (!msm_sdw->dev_up \|\|
		!q6core_is_adsp_ready()) {
		if (!msm_sdw->dev_up) {
		dev_err_ratelimited(msm_sdw->dev, "%s: q6 not ready\n",
		__func__);
		return 0;
		@@ -344,8 +343,7 @@ static int msm_sdw_ahb_read_device(struct msm_sdw_priv *msm_sdw,
		{
		u32 temp;

		if (!msm_sdw->dev_up \|\|
		!q6core_is_adsp_ready()) {
		if (!msm_sdw->dev_up) {
		dev_err_ratelimited(msm_sdw->dev, "%s: q6 not ready\n",
		__func__);
		return 0;