linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] ASoC: Intel: Skylake: Fix error return code in skl_probe()
@ 2016-08-12 11:45 Wei Yongjun
  2016-08-12 12:11 ` Vinod Koul
  0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-08-12 11:45 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	Vinod Koul, Jeeja KP, Subhransu S. Prusty, Jayachandran B
  Cc: Wei Yongjun, alsa-devel, linux-kernel

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>
---
 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);

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] ASoC: Intel: Skylake: Fix error return code in skl_probe()
  2016-08-12 11:45 [PATCH -next] ASoC: Intel: Skylake: Fix error return code in skl_probe() Wei Yongjun
@ 2016-08-12 12:11 ` Vinod Koul
  0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2016-08-12 12:11 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	Jeeja KP, Subhransu S. Prusty, Jayachandran B, alsa-devel,
	linux-kernel

On Fri, Aug 12, 2016 at 11:45:18AM +0000, Wei Yongjun wrote:
> Fix to return error code -ENODEV from the error handling
> case instead of 0, as done elsewhere in this function.

Acked-By: Vinod Koul <vinod.kou@intel.com>

-- 
~Vinod

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-08-12 12:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-12 11:45 [PATCH -next] ASoC: Intel: Skylake: Fix error return code in skl_probe() Wei Yongjun
2016-08-12 12:11 ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).