diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-28 04:06:55 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-28 04:06:55 (GMT) |
| commit | 2350bc148253bbd1a6c2c1ca062a6405c40ed0db (patch) | |
| tree | 83e7f4cc5557fbb6e00e359113056fa136c52153 /sound/hda/hdac_controller.c | |
| parent | 7b2f683fe2733153307cc6b870bcb37c87331cc9 (diff) | |
| parent | d785062ef20f9b2cd8cedcafea55ca8264f25f3e (diff) | |
| download | linux-2350bc148253bbd1a6c2c1ca062a6405c40ed0db.tar.xz | |
Merge tag 'v4.9.59' into linux-linaro-lsk-v4.9
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 0f41257..8761877 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"); |