[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1471002318-20209-1-git-send-email-weiyj.lk@gmail.com>
Date: Fri, 12 Aug 2016 11:45:18 +0000
From: Wei Yongjun <weiyj.lk@...il.com>
To: Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Vinod Koul <vinod.koul@...el.com>,
Jeeja KP <jeeja.kp@...el.com>,
"Subhransu S. Prusty" <subhransu.s.prusty@...el.com>,
Jayachandran B <jayachandran.b@...el.com>
Cc: Wei Yongjun <weiyj.lk@...il.com>, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org
Subject: [PATCH -next] ASoC: Intel: Skylake: Fix error return code in skl_probe()
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@...il.com>
---
sound/soc/intel/skylake/skl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index a893ca1..2989c16 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -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);
Powered by blists - more mailing lists