Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
48435ad
ALSA: pcm: Return 0 when size < start_threshold in capture
psqli Aug 25, 2018
69b2311
ALSA: memalloc: Don't align the size to power-of-two
tiwai Aug 8, 2018
88093be
ALSA: memalloc: Simplify snd_malloc_dev_pages() calls
tiwai Aug 10, 2018
04f39c7
ALSA: memalloc: Add non-cached buffer type
tiwai Aug 8, 2018
36b4ebe
regmap: split up regmap_config.use_single_rw
dpfrey Sep 1, 2018
5d5424a
ALSA: pcm: Update hardware pointer before start capture
psqli Sep 7, 2018
2527d12
ALSA: hda: Fix mismatch for register mask and value in ext controller.
keyonjie Sep 28, 2018
c80bd80
ALSA: rawmidi: A lightweight function to discard pending bytes
tiwai Sep 13, 2018
e326ae8
ALSA: memalloc: Add fall-through annotation
tiwai Oct 4, 2018
6b03a07
ASoC: Intel: mrfld: fix uninitialized variable access
arndb Nov 3, 2018
f575459
ASoC: nau8825: remove unnecessary unlikely()
TinyWindzz Nov 4, 2018
e4abd31
ASoC: codecs: constify snd_soc_dai_ops structures
JuliaLawall Oct 27, 2018
02af69d
ASoC: intel: cht_bsw_max98090_ti: Add quirk for boards using pmc_plt_…
jwrdegoede Oct 31, 2018
fb32f41
ASoC: acpi: define common interface for machine driver configuration
plbossart Nov 1, 2018
485454e
ASoC: Intel: use standard interface for Hdaudio machine driver
plbossart Nov 1, 2018
f2ed9a0
ASoC: Intel: use standard interface for Atom machine drivers
plbossart Nov 1, 2018
8d4f2e5
ASoC: Intel: boards: fix Skylake typo
plbossart Nov 1, 2018
8fdfa0a
ASoC: Intel: remove GFP_ATOMIC, use GFP_KERNEL
plbossart Nov 1, 2018
2e70099
ASoC: Intel: common: add SOF information for APL RVP
bardliao Nov 1, 2018
2279f90
ASoC: Intel: common: add quirk for APL RVP boards
plbossart Nov 1, 2018
928f4c6
ASoC: Intel" bytcr_rt5640: revert SOF-specific changes
plbossart Nov 9, 2018
4edef6e
ASoC: Intel: cht_bsw_rt5645: revert SOF-specific changes
plbossart Nov 9, 2018
2a65aad
ASoC: Intel: skl-generic: revert SOF-specific changes
plbossart Nov 9, 2018
e2910c7
ASoC: SOF: remove codec_mask from sof dev
plbossart Nov 9, 2018
b8ea5c2
ASoC: SOF: Intel: hda: pass codec_mask with new pdata structure
plbossart Nov 9, 2018
abedb56
Merge branch 'backport/v4.19-intel-audio' into fix/v4.19-intel-audio-…
plbossart Nov 9, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ASoC: nau8825: remove unnecessary unlikely()
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 0b6277e)
  • Loading branch information
TinyWindzz authored and plbossart committed Nov 9, 2018
commit f575459445e08949c6be877a0cda883bcf15bdc7
4 changes: 1 addition & 3 deletions sound/soc/codecs/nau8825.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,8 @@ static u32 nau8825_xtalk_sidetone(u32 sig_org, u32 sig_cros)
{
u32 gain, sidetone;

if (unlikely(sig_org == 0) || unlikely(sig_cros == 0)) {
WARN_ON(1);
if (WARN_ON(sig_org == 0 || sig_cros == 0))
return 0;
}

sig_org = nau8825_intlog10_dec3(sig_org);
sig_cros = nau8825_intlog10_dec3(sig_cros);
Expand Down