Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/topology', 'asoc/topic/wm8903' and 'asoc/topic/wm8904' into asoc-next

+11 -7
+1 -1
include/uapi/sound/asoc.h
··· 243 243 __le32 control_elems; /* number of control elements */ 244 244 __le32 widget_elems; /* number of widget elements */ 245 245 __le32 graph_elems; /* number of graph elements */ 246 - __le32 dai_elems; /* number of DAI elements */ 246 + __le32 pcm_elems; /* number of PCM elements */ 247 247 __le32 dai_link_elems; /* number of DAI link elements */ 248 248 struct snd_soc_tplg_private priv; 249 249 } __attribute__((packed));
+1 -1
sound/soc/codecs/wm8903.c
··· 1804 1804 1805 1805 regmap_read(wm8903->regmap, WM8903_GPIO_CONTROL_1 + offset, &reg); 1806 1806 1807 - return (reg & WM8903_GP1_LVL_MASK) >> WM8903_GP1_LVL_SHIFT; 1807 + return !!((reg & WM8903_GP1_LVL_MASK) >> WM8903_GP1_LVL_SHIFT); 1808 1808 } 1809 1809 1810 1810 static int wm8903_gpio_direction_out(struct gpio_chip *chip,
+1 -1
sound/soc/codecs/wm8904.c
··· 312 312 case WM8904_FLL_NCO_TEST_1: 313 313 return true; 314 314 default: 315 - return true; 315 + return false; 316 316 } 317 317 } 318 318
+8 -4
sound/soc/tegra/tegra_alc5632.c
··· 101 101 102 102 static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) 103 103 { 104 + int ret; 104 105 struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card); 105 106 106 - snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, 107 - &tegra_alc5632_hs_jack, 108 - tegra_alc5632_hs_jack_pins, 109 - ARRAY_SIZE(tegra_alc5632_hs_jack_pins)); 107 + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", 108 + SND_JACK_HEADSET, 109 + &tegra_alc5632_hs_jack, 110 + tegra_alc5632_hs_jack_pins, 111 + ARRAY_SIZE(tegra_alc5632_hs_jack_pins)); 112 + if (ret) 113 + return ret; 110 114 111 115 if (gpio_is_valid(machine->gpio_hp_det)) { 112 116 tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;