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

Merge branch 'for-3.1' into for-3.2

Mark Brown f648de83 26806a42

-26
-26
sound/soc/codecs/wm8962.c
··· 3660 3660 } 3661 3661 EXPORT_SYMBOL_GPL(wm8962_mic_detect); 3662 3662 3663 - #ifdef CONFIG_PM 3664 - static int wm8962_resume(struct snd_soc_codec *codec) 3665 - { 3666 - u16 *reg_cache = codec->reg_cache; 3667 - int i; 3668 - 3669 - /* Restore the registers */ 3670 - for (i = 1; i < codec->driver->reg_cache_size; i++) { 3671 - switch (i) { 3672 - case WM8962_SOFTWARE_RESET: 3673 - continue; 3674 - default: 3675 - break; 3676 - } 3677 - 3678 - if (reg_cache[i] != wm8962_reg[i]) 3679 - snd_soc_write(codec, i, reg_cache[i]); 3680 - } 3681 - 3682 - return 0; 3683 - } 3684 - #else 3685 - #define wm8962_resume NULL 3686 - #endif 3687 - 3688 3663 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 3689 3664 static int beep_rates[] = { 3690 3665 500, 1000, 2000, 4000, ··· 4171 4196 static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { 4172 4197 .probe = wm8962_probe, 4173 4198 .remove = wm8962_remove, 4174 - .resume = wm8962_resume, 4175 4199 .set_bias_level = wm8962_set_bias_level, 4176 4200 .reg_cache_size = WM8962_MAX_REGISTER + 1, 4177 4201 .reg_word_size = sizeof(u16),