diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:25:59 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:25:59 -0500 |
| commit | 4cb0d8b5c50c26cb4453a6028f7d45f5a562ac84 (patch) | |
| tree | 6fa1973a757c8cd221cba9b3bfc03205b9c7267e /sound/hda/hdac_controller.c | |
| parent | c36cc5ed4905935412f0ae665a763dd3eff6b442 (diff) | |
| parent | d785062ef20f9b2cd8cedcafea55ca8264f25f3e (diff) | |
| download | linux-rt-4cb0d8b5c50c26cb4453a6028f7d45f5a562ac84.tar.gz | |
Merge tag 'v4.9.59' into v4.9-rt
This is the 4.9.59 stable release
Diffstat (limited to 'sound/hda/hdac_controller.c')
| -rw-r--r-- | sound/hda/hdac_controller.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 0f41257d339e..8761877207ec 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -284,6 +284,11 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) dev_dbg(bus->dev, "HDA capability ID: 0x%x\n", (cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF); + if (cur_cap == -1) { + dev_dbg(bus->dev, "Invalid capability reg read\n"); + break; + } + switch ((cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF) { case AZX_ML_CAP_ID: dev_dbg(bus->dev, "Found ML capability\n"); |