diff mbox

ALSA: hda controller - handle -1 value as error in snd_hdac_bus_parse_capabilities()

Message ID 20171024165647.8417-1-perex@perex.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Jaroslav Kysela Oct. 24, 2017, 4:56 p.m. UTC
We have seen this value on a development platform.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 sound/hda/hdac_controller.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Takashi Iwai Oct. 24, 2017, 6:58 p.m. UTC | #1
On Tue, 24 Oct 2017 18:56:47 +0200,
Jaroslav Kysela wrote:
> 
> We have seen this value on a development platform.
> 
> Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Thanks, but this was already fixed in the last week :)
The fix commit is
  098a0a62c1554f5a3813ef1b8539563214ada8f6
and it'll be backported to stable kernels.


Takashi


> ---
>  sound/hda/hdac_controller.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
> index 978dc1801b3a..4a1823290b2d 100644
> --- a/sound/hda/hdac_controller.c
> +++ b/sound/hda/hdac_controller.c
> @@ -278,6 +278,11 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus)
>  	do {
>  		cur_cap = _snd_hdac_chip_readl(bus, offset);
>  
> +		if (cur_cap == 0xffffffff) {
> +			dev_dbg(bus->dev, "Wrong capability -1\n");
> +			break;
> +		}
> +
>  		dev_dbg(bus->dev, "Capability version: 0x%x\n",
>  			(cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF);
>  
> -- 
> 2.13.6
>
diff mbox

Patch

diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
index 978dc1801b3a..4a1823290b2d 100644
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
@@ -278,6 +278,11 @@  int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus)
 	do {
 		cur_cap = _snd_hdac_chip_readl(bus, offset);
 
+		if (cur_cap == 0xffffffff) {
+			dev_dbg(bus->dev, "Wrong capability -1\n");
+			break;
+		}
+
 		dev_dbg(bus->dev, "Capability version: 0x%x\n",
 			(cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF);