ASoC: Intel: Skylake: Fix error return code in skl_probe()
authorWei Yongjun <weiyj.lk@gmail.com>
Fri, 12 Aug 2016 11:45:18 +0000 (11:45 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 12 Aug 2016 12:29:12 +0000 (13:29 +0100)
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>
sound/soc/intel/skylake/skl.c

index cd59536a761dd84bcca2fb3afb44dc82adf1b417..e3e7641677657ecffb828ec94c865d0e80201dbf 100644 (file)
@@ -672,8 +672,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);