[next] ALSA: hda: cs35l41: Fix missing error code in cs35l41_smart_amp()

Message ID 20231030070836.3234385-1-harshit.m.mogalapalli@oracle.com
State New
Headers
Series [next] ALSA: hda: cs35l41: Fix missing error code in cs35l41_smart_amp() |

Commit Message

Harshit Mogalapalli Oct. 30, 2023, 7:08 a.m. UTC
  When firmware status is invalid, assign -EINVAL to ret as ret is '0' at
that point and returning success is incorrect when firmware status is
invalid.

Fixes: a51d8ba03a4f ("ALSA: hda: cs35l41: Check CSPL state after loading firmware")
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
---
This is found using smatch and only compile tested.
---
 sound/pci/hda/cs35l41_hda.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Takashi Iwai Oct. 31, 2023, 5:31 p.m. UTC | #1
On Mon, 30 Oct 2023 08:08:36 +0100,
Harshit Mogalapalli wrote:
> 
> When firmware status is invalid, assign -EINVAL to ret as ret is '0' at
> that point and returning success is incorrect when firmware status is
> invalid.
> 
> Fixes: a51d8ba03a4f ("ALSA: hda: cs35l41: Check CSPL state after loading firmware")
> Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>

Thanks, applied now.


Takashi


> ---
> This is found using smatch and only compile tested.
> ---
>  sound/pci/hda/cs35l41_hda.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
> index 496ff6a9d300..09f8d8fa4c71 100644
> --- a/sound/pci/hda/cs35l41_hda.c
> +++ b/sound/pci/hda/cs35l41_hda.c
> @@ -1042,6 +1042,7 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
>  	default:
>  		dev_err(cs35l41->dev, "Firmware status is invalid: %u\n",
>  			fw_status);
> +		ret = -EINVAL;
>  		goto clean_dsp;
>  	}
>  
> -- 
> 2.39.3
>
  

Patch

diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 496ff6a9d300..09f8d8fa4c71 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -1042,6 +1042,7 @@  static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
 	default:
 		dev_err(cs35l41->dev, "Firmware status is invalid: %u\n",
 			fw_status);
+		ret = -EINVAL;
 		goto clean_dsp;
 	}