diff options
| -rw-r--r-- | sound/soc/codecs/wm8994_voodoo.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8994_voodoo.c b/sound/soc/codecs/wm8994_voodoo.c index 1334a89..c38e7be 100644 --- a/sound/soc/codecs/wm8994_voodoo.c +++ b/sound/soc/codecs/wm8994_voodoo.c @@ -485,15 +485,17 @@ bool is_path(int unified_path) || wm8994->fmradio_path == FMR_HP); #else #ifdef M110S +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) + return (wm8994->cur_path == HP + || wm8994->cur_path == HP_NO_MIC); +#else return (wm8994->cur_path == HP); +#endif #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) return (wm8994->cur_path == HP || wm8994->cur_path == HP_NO_MIC -#ifndef M110S - || wm8994->fmradio_path == FMR_HP -#endif - ); + || wm8994->fmradio_path == FMR_HP); #else return (wm8994->cur_path == HP || wm8994->fmradio_path == FMR_HP); @@ -1669,16 +1671,17 @@ unsigned int voodoo_hook_wm8994_write(struct snd_soc_codec *codec_, } if (debug_log(LOG_VERBOSE)) // log every write to dmesg + printk("Voodoo sound: wm8994_write 0x%03X 0x%04X " #ifdef NEXUS_S - printk("Voodoo sound: codec_state=%u, stream_state=%u, " + "codec_state=%u, stream_state=%u, " "cur_path=%i, rec_path=%i, " "power_state=%i\n", + reg, value, wm8994->codec_state, wm8994->stream_state, wm8994->cur_path, wm8994->rec_path, wm8994->power_state); #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) - printk("Voodoo sound: wm8994_write 0x%03X 0x%04X " "codec_state=%u, stream_state=%u, " "cur_path=%i, rec_path=%i, " #ifndef M110S @@ -1701,7 +1704,6 @@ unsigned int voodoo_hook_wm8994_write(struct snd_soc_codec *codec_, #endif wm8994->power_state); #else - printk("Voodoo sound: wm8994_write 0x%03X 0x%04X " "codec_state=%u, stream_state=%u, " "cur_path=%i, rec_path=%i, " #ifndef M110S |