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:23:45 +0200 |
| commit | 49fca97a99305c54fc6c060b492c5bc1b592b73d (patch) | |
| tree | 001b777b01d75a77a19730bd0757d48231777cde | |
| parent | 3039eb4d8ac5074ee95d68ac2b5f5b48ae59db29 (diff) | |
| download | linux-stable-49fca97a99305c54fc6c060b492c5bc1b592b73d.tar.gz linux-stable-49fca97a99305c54fc6c060b492c5bc1b592b73d.tar.bz2 linux-stable-49fca97a99305c54fc6c060b492c5bc1b592b73d.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 caa69c4598a6..b4844f78266f 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -464,8 +464,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; + } pci_set_drvdata(skl->pci, ebus); |