diff options
| author | Wei Yongjun <weiyj.lk@gmail.com> | 2016-08-12 11:45:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-07 15:21:24 +0200 |
| commit | 44ced8fcf96783928aa4f0aa3b87721b88e562c8 (patch) | |
| tree | a205f3239a7f5833ba67cc8a332a7ffe338e1da4 | |
| parent | 5337a8ba4e07bc0cd0249a8282d1a11983337f0f (diff) | |
| download | lwn-44ced8fcf96783928aa4f0aa3b87721b88e562c8.tar.gz lwn-44ced8fcf96783928aa4f0aa3b87721b88e562c8.zip | |
ASoC: Intel: Skylake: Fix error return code in skl_probe()
commit 979cf59acc9d634cc140aadd0d2915947ab303cc upstream.
Fix to return error code -ENODEV from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: 87b2bdf02278 ("ASoC: Intel: Skylake: Initialize NHLT table")
Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
Acked-By: Vinod Koul <vinod.kou@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 06d8c263c68f..d5a0327e8ff1 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -659,8 +659,10 @@ static int skl_probe(struct pci_dev *pci, skl->nhlt = skl_nhlt_init(bus->dev); - if (skl->nhlt == NULL) + if (skl->nhlt == NULL) { + err = -ENODEV; goto out_free; + } skl_nhlt_update_topology_bin(skl); |