lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 23 Jan 2014 07:22:48 +0000 From: "Li.Xiubo@...escale.com" <Li.Xiubo@...escale.com> To: Jean-Francois Moine <moinejf@...e.fr> CC: "lgirdwood@...il.com" <lgirdwood@...il.com>, "broonie@...nel.org" <broonie@...nel.org>, "shawn.guo@...aro.org" <shawn.guo@...aro.org>, "kuninori.morimoto.gx@...esas.com" <kuninori.morimoto.gx@...esas.com>, "alsa-devel@...a-project.org" <alsa-devel@...a-project.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: RE: [PATCH Resend 2/8] ASoC: simple-card: fix __asoc_simple_card_dai_init > > diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple- > card.c > > index 6443c87..3b8c9a2 100644 > > --- a/sound/soc/generic/simple-card.c > > +++ b/sound/soc/generic/simple-card.c > > @@ -31,16 +31,21 @@ static int __asoc_simple_card_dai_init(struct > snd_soc_dai *dai, > > > > daifmt |= set->fmt; > > > > - if (daifmt) > > + if (daifmt) { > > ret = snd_soc_dai_set_fmt(dai, daifmt); > > - > > - if (ret == -ENOTSUPP) { > > - dev_dbg(dai->dev, "ASoC: set_fmt is not supported\n"); > > - ret = 0; > > + if (ret && ret != -ENOTSUPP) { > > + dev_err(dai->dev, "simple-card: set_fmt error\n"); > > + return ret; > > + } > > } > > > > - if (!ret && set->sysclk) > > + if (set->sysclk) { > > ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0); > > + if (ret && ret != -ENOTSUPP) { > > + dev_err(dai->dev, "simple-card: set_sysclk error\n"); > > + return ret; > > + } > > + } > > > > return ret; > > Sorry: you must return 0 here > Yes, the ret maybe -ENOTSUPP. I will revise it. Thanks, Best Regards, Xiubo
Powered by blists - more mailing lists