- Alsa-devel - mailman.alsa-project.org

[alsa-devel] Support for SAM9407?
by Ash Willis 02 May '07

02 May '07

Hi, I've just been digging around for information on the old Dream SAM9407 chip. What's the current support status in ALSA for this chip? I know some work was done on producing drivers for cards based on this chip and I know there were plans to port the efforts to ALSA. Did that ever happen? It doesn't seem so. Was there a specific reason why it wasn't ported in the end? In the interest of making ALSA that bit more complete as well as trying to improve my skills, I've been looking around for some older hardware that I can write drivers for. This chip seems like a good candidate considering the cards haven't quite disappeared into oblivion :) I was looking into the possiblity of porting the remaining kernel OSS drivers to ALSA...but I can't even find any test hardware because they're so rare. Ash Willis =

3 2

Re: [alsa-devel] alsa driver api
by Ciaccia 02 May '07

02 May '07

Hi Michel, Maybe you are referring to my post. I always use alsa-lib to send data to the driver, I think it is the easiest way and preferred way. Months ago I wanted to do the same (i.e. send data to the alsa-driver without alsa-lib) but then I understood this was not the right way. I'm not saying you cannot or should not try that, but from my experience (I spent a lot of time) it's not going to work. The problem I had was that my system did not support shared objects, nor -ldl, so I could not user the "standard" alsa-lib (which usually require pthread, dl, an *.so). Then Takashi gave me a patch for that, and now I'm an happy "static" alsa-lib user. Maybe one of the gurus (Takashi?) will give you some tips, but I think you really need a good reason for that. Good luck, sorry for not helping you Andrea ----- Original Message ---- From: Michel Benoit <murpme(a)gmail.com> To: ciacciax(a)yahoo.com; alsa-devel(a)alsa-project.org Sent: Wednesday, May 2, 2007 7:40:29 PM Subject: alsa driver api Hi Does anyone have some code examples that show how to send pcm samples directly to an alsa driver. I'm (still) having trouble building/using alsa-lib and I want to make sure that my driver works correctly. If I understand correctly it is possible to send sound samples using the alsa driver api only (no alsa-lib). All I want to do for now is send a fixed sine wave to the driver. I saw some code snippets that seemed to do just that in a recent email on this list but it would help a lot if I could have a look at the complete application. Thanks, Michel __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

[alsa-devel] how does a buffer underrun / broken pipe error take place?
by Ashlesha Shintre 02 May '07

02 May '07

Hi, Following up from my previous email, is there a website that explains in greater detail exactly how a buffer underrun occurs? I think that might help greatly in debugging my program, attached with the previous email. Thanks, Ashlesha.

1 0

[alsa-devel] error in recovery from buffer under-run.
by Ashlesha Shintre 02 May '07

02 May '07

Hi, Thanks for the link you emailed earlier. I tried writing my own code, based on the how to in the alsa wiki. I have attached that code with this email. The problem it faces is a buffer underrun every alternate time, i try writing to the device. In my code, to take care of underruns, I do the following: period_size=64; buffer is a short int array which is 16000 in length. every alternate call to snd_pcm_writei is successful but only write in the vicinity of 1350 frames, instead of size which is initialised to length of buffer. Now, in the code below, the snd_pcm_recover function prints a message indicating a buffer under-run has occured, however, it returns a 0, indicating success in recovery from the error! I am not sure how to deal with this -- is there a problem with my ALSA libraries? Sorry about the length of this email and thanks again, Ashlesha. while(size>(2*period_size)) > { > frames = snd_pcm_writei (pcm_handle, buffer, size); > printf("frames returned is %d\n",frames); > if (frames>0) > temp=frames; > if (frames == -32){ > frames = snd_pcm_recover(pcm_handle, frames, 0); > printf("recover returned %d\n",frames); > } > if (frames < 0){ > printf("snd_pcm_writei failed: %s\n", snd_strerror(frames)); > return -1; > } > printf("%d frames written\n",frames); > if(temp>0) > size=size-temp; > } >

1 1

Re: [alsa-devel] [ALSA][hda-codec] fix-connexant-headphone-mute
by Takashi Iwai 02 May '07

02 May '07

[keep cc to alsa-devel please] At Wed, 02 May 2007 13:47:53 +0300, Andrei Popa wrote: > > On Wed, 2007-05-02 at 12:16 +0200, Takashi Iwai wrote: > > At Sun, 29 Apr 2007 05:19:50 +0300, > > Andrei Popa wrote: > > > > > > On Sun, 2007-04-29 at 04:43 +0300, Andrei Popa wrote: > > > > Hi, > > > > > > > > The sound works ok with the built-in speakers on my Fujitsu laptop(amilo > > > > pro v3205). But if I plug in headphones in the audio out jack there is > > > > no sound in the headphones. With kernel 2.6.20 it worked ok. With 2.6.21 > > > > it doesn't. > > > > This BUG is reported in ALSA bugtracking system with ID 0003039. > > > > > > > > Patch that fixes this bug: > > > > > > > > diff --git a/sound/pci/hda/patch_conexant.c > > > > b/sound/pci/hda/patch_conexant.c > > > > index 46e93c6..5edd330 100644 > > > > --- a/sound/pci/hda/patch_conexant.c > > > > +++ b/sound/pci/hda/patch_conexant.c > > > > @@ -636,7 +636,7 @@ static void cxt5045_hp_automute(struct hda_codec > > > > *codec) > > > > > > > > bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; > > > > snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, > > > > bits); > > > > - snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, > > > > bits); > > > > + snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0, > > > > bits); > > > > } > > > > > > > > /* unsolicited event for HP jack sensing */ > > > > @@ -988,10 +988,10 @@ static void cxt5047_hp_automute(struct hda_codec > > > > *codec) > > > > > > > > bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; > > > > snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, > > > > bits); > > > > - snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, > > > > bits); > > > > + snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0, > > > > bits); > > > > /* Mute/Unmute PCM 2 for good measure - some systems need this > > > > */ > > > > snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, > > > > bits); > > > > - snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, > > > > bits); > > > > + snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0, > > > > bits); > > > > } > > > > > > > > /* toggle input of built-in and mic jack appropriately */ > > > > > > > > > > first patch was broken. it only worked for the right channel. > > > this fixes this: > > > > > > diff --git a/sound/pci/hda/patch_conexant.c > > > b/sound/pci/hda/patch_conexant.c > > > index 46e93c6..0822df7 100644 > > > --- a/sound/pci/hda/patch_conexant.c > > > +++ b/sound/pci/hda/patch_conexant.c > > > @@ -635,8 +635,8 @@ static void cxt5045_hp_automute(struct hda_codec > > > *codec) > > > AC_VERB_GET_PIN_SENSE, 0) & > > > 0x80000000; > > > > > > bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; > > > - snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, > > > bits); > > > - snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, > > > bits); > > > + snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0, > > > bits); > > > + snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0, > > > bits); > > > } > > > > > > /* unsolicited event for HP jack sensing */ > > > @@ -987,11 +987,11 @@ static void cxt5047_hp_automute(struct hda_codec > > > *codec) > > > AC_VERB_GET_PIN_SENSE, 0) & > > > 0x80000000; > > > > > > bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; > > > - snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, > > > bits); > > > - snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, > > > bits); > > > + snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0, > > > bits); > > > + snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0, > > > bits); > > > /* Mute/Unmute PCM 2 for good measure - some systems need this > > > */ > > > - snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, > > > bits); > > > - snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, > > > bits); > > > + snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0, > > > bits); > > > + snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0, > > > bits); > > > } > > > > > > /* toggle input of built-in and mic jack appropriately */ > > > > But this means to _unmute_ the speaker (0x1d) when you plug HP. > > So, something else should be wrong. Is hp_present detected properly > > per plugging or unplugging? > > > > when I debugged the problem I think hp_present was "0" when the HP were > plugged in and "-28953535"(a big negative number) when the HP were > unplugged. Weird, then this returns exactly the inversed bit. Could you double-check? Anyway, having both this auto-mute and manual switches is confusing. If they exist, we'd need to add notifier to the control at unsol event handler. Takashi

3 2

[alsa-devel] Intel ICH6 with AD1986: Mic not working
by Joerg Platte 02 May '07

02 May '07

Hi! On my computer both microphones are not working but playback and all other audio stuff seems to work. I'm not sure if the microphones ever worked with alsa because I never tried it before. On windows they are working as expected, hence the hardware seems to be OK. Is there anything I can do to further debug this? Is it a known problem? Below you can find more information about the hardware: root@ds19:~> uname -a Linux ds19 2.6.20-1-686 #1 SMP Tue Apr 24 21:52:11 UTC 2007 i686 GNU/Linux (Debian kernel) Doesn't work with 2.6.18 as well. root@ds19:~> cat /proc/asound/card0/codec97#0/ac97#0-0 0-0/0: Analog Devices AD1986 PCI Subsys Vendor: 0x1734 PCI Subsys Device: 0x105a Revision : 0x02 Compat. Class : 0x00 Subsys. Vendor ID: 0x0000 Subsys. ID : 0x0000 Capabilities : -headphone out- DAC resolution : 20-bit ADC resolution : 16-bit 3D enhancement : No 3D Stereo Enhancement Current setup Mic gain : +20dB [+20dB] POP path : pre 3D Sim. stereo : off 3D enhancement : off Loudness : off Mono output : MIX Mic select : Mic1 ADC/DAC loopback : off Double rate slots: 10/11 Extended ID : codec=0 rev=2 AMAP LDAC SDAC CDAC DSA=0 SPDIF DRA VRA Extended status : SPCV LDAC SDAC CDAC SPDIF=10/11 VRA PCM front DAC : 48000Hz PCM Surr DAC : 48000Hz PCM LFE DAC : 48000Hz PCM ADC : 48000Hz SPDIF Control : Consumer PCM Copyright Category=0x22 Generation=1 Rate=48kHz Gain Inverted Buffer delay Location Master Out : 0.0 dBV - 16/fs Rear I/O Panel AUX Out : 0.0 dBV - 16/fs Rear I/O Panel Center/LFE Out : 0.0 dBV - 16/fs Rear I/O Panel Mic 1 : 0.0 dBV - 16/fs Rear I/O Panel Mic 2 : 0.0 dBV - 16/fs Rear I/O Panel Line In : 0.0 dBV - 16/fs Rear I/O Panel AD18XX configuration Unchained : 0x1000,0x0000,0x0000 Chained : 0x0000,0x0000,0x0000 root@ds19:~> cat /proc/asound/card0/codec97#0/ac97#0-0+regs 0:00 = 0090 0:02 = 0404 0:04 = 0606 0:06 = 0006 0:08 = 0000 0:0a = 0000 0:0c = 801f 0:0e = 0040 0:10 = 9f9f 0:12 = 0606 0:14 = 0000 0:16 = 9f9f 0:18 = 0606 0:1a = 0000 0:1c = 0000 0:1e = 0000 0:20 = 0000 0:22 = 0000 0:24 = 0000 0:26 = 800f 0:28 = 0bc7 0:2a = 05f1 0:2c = bb80 0:2e = bb80 0:30 = bb80 0:32 = bb80 0:34 = 0000 0:36 = 0300 0:38 = 0202 0:3a = 2a20 0:3c = 0000 0:3e = 0000 0:40 = 0000 0:42 = 0000 0:44 = 0000 0:46 = 0000 0:48 = 0000 0:4a = 0000 0:4c = 0000 0:4e = 0000 0:50 = 0000 0:52 = 0000 0:54 = 0000 0:56 = 0000 0:58 = 0000 0:5a = 0000 0:5c = 1000 0:5e = 0000 0:60 = 8080 0:62 = 0000 0:64 = 0000 0:66 = 0000 0:68 = 0000 0:6a = 0000 0:6c = 8080 0:6e = 8080 0:70 = 0000 0:72 = 0000 0:74 = 1001 0:76 = 7c7c 0:78 = 0000 0:7a = 0000 0:7c = 4144 0:7e = 5378 root@ds19:~> cat /proc/asound/cards 0 [ICH6 ]: ICH4 - Intel ICH6 Intel ICH6 with AD1986 at 0xf0140800, irq 16 root@ds19:~> lspci 00:00.0 Host bridge: Intel Corporation 82915G/P/GV/GL/PL/910GL Memory Controller Hub (rev 04) 00:02.0 VGA compatible controller: Intel Corporation 82915G/GV/910GL Integrated Graphics Controller (rev 04) 00:02.1 Display controller: Intel Corporation 82915G Integrated Graphics Controller (rev 04) 00:1c.0 PCI bridge: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1 (rev 03) 00:1c.1 PCI bridge: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2 (rev 03) 00:1c.2 PCI bridge: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3 (rev 03) 00:1c.3 PCI bridge: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4 (rev 03) 00:1d.0 USB Controller: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1 (rev 03) 00:1d.1 USB Controller: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2 (rev 03) 00:1d.2 USB Controller: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3 (rev 03) 00:1d.3 USB Controller: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4 (rev 03) 00:1d.7 USB Controller: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB2 EHCI Controller (rev 03) 00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev d3) 00:1e.2 Multimedia audio controller: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller (rev 03) 00:1f.0 ISA bridge: Intel Corporation 82801FB/FR (ICH6/ICH6R) LPC Interface Bridge (rev 03) 00:1f.1 IDE interface: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) IDE Controller (rev 03) 00:1f.2 IDE interface: Intel Corporation 82801FB/FW (ICH6/ICH6W) SATA Controller (rev 03) 00:1f.3 SMBus: Intel Corporation 82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller (rev 03) 07:00.0 Ethernet controller: Broadcom Corporation NetXtreme BCM5751 Gigabit Ethernet PCI Express (rev 01) root@ds19:~> lsmod | grep snd snd_intel8x0 31420 1 snd_ac97_codec 89412 1 snd_intel8x0 ac97_bus 2432 1 snd_ac97_codec snd_pcm_oss 39232 0 snd_mixer_oss 15488 1 snd_pcm_oss snd_pcm 72036 3 snd_intel8x0,snd_ac97_codec,snd_pcm_oss snd_timer 20964 1 snd_pcm snd 48196 8 snd_intel8x0,snd_ac97_codec,snd_pcm_oss,snd_mixer_oss,snd_pcm,snd_timer soundcore 7616 1 snd snd_page_alloc 9736 2 snd_intel8x0,snd_pcm regards, Jörg Grüße, Jörg -- PGP Key: send mail with subject 'SEND PGP-KEY' PGP Key-ID: FD 4E 21 1D PGP Fingerprint: 388A872AFC5649D3 BCEC65778BE0C605

1 0

[alsa-devel] 2.6.21: known regressions with patches (for -stable team)
by Michal Piotrowski 02 May '07

02 May '07

Hi all, Here is a list of known regressions with patches available. Feel free to add new regressions/remove fixed etc. http://kernelnewbies.org/known_regressions Subject : 2.6.21: longhaul freq-scaling broken References : http://lkml.org/lkml/2007/5/1/260 Submitter : Jan Kiszka <jan.kiszka(a)web.de> Patch : http://git.kernel.org/?p=linux/kernel/git/davej/cpufreq.git;a=commitdiff_pl… Status : patch available Subject : Kernel hang at "kernel: switched to high resolution mode on cpu 0" when either/both of CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS is used References : http://lkml.org/lkml/2007/4/30/464 Submitter : Mark Lord <lkml(a)rtr.ca> Handled-By : Daniel Walker <dwalker(a)mvista.com> Thomas Gleixner <tglx(a)linutronix.de> Patch : http://lkml.org/lkml/2007/4/13/190 Status : patch was suggested Subject : ACPI related kernel panic References : http://lkml.org/lkml/2007/4/30/193 http://bugzilla.kernel.org/show_bug.cgi?id=8385 Submitter : Sebastian Kemper <sebastian_ml(a)gmx.net> Patches : http://bugzilla.kernel.org/attachment.cgi?id=11331&action=view http://bugzilla.kernel.org/attachment.cgi?id=11332&action=view Status : patches was suggested Subject : sis900 oops in 2.6.21.1 after bringing up the network References : http://lkml.org/lkml/2007/4/29/138 http://lkml.org/lkml/2007/4/29/151 Patch : http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… Submitter : Brett Ryland <nappers(a)gmail.com> Status : patch available Subject : reiserfs -- circular locking References : http://lkml.org/lkml/2007/4/26/648 Submitter : David Brownell < david-b(a)pacbell.net > Handled-By : Jeff Mahoney < jeffm(a)suse.com > Patch : http://lkml.org/lkml/2007/4/27/332 Status : patch available Subject : Oops when changing USB DVB-T adapter References : http://lkml.org/lkml/2007/3/9/212 http://lkml.org/lkml/2007/4/5/154 Submitter : CIJOML <cijoml(a)volny.cz> Handled-By : Markus Rechberger < markus.rechberger(a)amd.com > Status : patches available Subject : snd_intel8x0: divide error: 0000 References : http://lkml.org/lkml/2007/3/5/252 Submitter : Michal Piotrowski < michal.k.k.piotrowski(a)gmail.com > Handled-By : Takashi Iwai < tiwai(a)suse.de > Patch : http://lkml.org/lkml/2007/4/20/117 Status : patch available Subject : qla2xxx driver no longer works References : http://lkml.org/lkml/2007/4/16/49 http://lkml.org/lkml/2007/4/20/224 Submitter : David Miller < davem(a)davemloft.net > Robert Peterson < rpeterso(a)redhat.com > Handled-By : David Miller < davem(a)davemloft.net > Patch : http://lkml.org/lkml/2007/4/16/234 Status : patch was suggested Regards, Michal -- Michal K. K. Piotrowski Kernel Monkeys (http://kernel.wikidot.com/start)

1 0

[alsa-devel] [PATCH] snd-usb-audio: explicitly match Logitech QuickCam
by Daniel Drake 02 May '07

02 May '07

Commit 93c8bf45e083b89dffe3a708363c15c1b220c723 modified the USB device matching behaviour to ignore interface class matches if the device class is vendor-specific. This patch adds an explicit ID match for the Logitech QuickCam Messenger, which has a vendor specific device class (but standards-compliant audio interfaces). This fixes a 2.6.20 regression where the audio component of this device was no longer usable. http://bugs.gentoo.org/show_bug.cgi?id=175715 https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/93822 https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3040 Based on a patch from sergiom Signed-off-by: Daniel Drake <dsd(a)gentoo.org> Index: linux/sound/usb/usbquirks.h =================================================================== --- linux.orig/sound/usb/usbquirks.h +++ linux/sound/usb/usbquirks.h @@ -40,6 +40,21 @@ .bInterfaceClass = USB_CLASS_VENDOR_SPEC /* + * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface + * class matches do not take effect without an explicit ID match. + */ + +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f0, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL +}, + +/* * Yamaha devices */

3 2

[alsa-devel] ALC260 patch for Packard Bell Easy Note v7900
by Andrea Gozzi 02 May '07

02 May '07

Please see if you can accept this patch that fixes sound/headphones/mic on Packard Bell EN v7900 notebook (ALC260 chipset). The code is not mine, I diff'ed using pshou's (https://bugtrack.alsa-project.org/alsa-bug/view.php?id=2189) but since it works perfectly it would be nice to see it in the next alsa release. Andrea

2 1

[alsa-devel] [ALSA][hda-codec] fix-connexant-headphone-mute
by Andrei Popa 02 May '07

02 May '07

Hi, The sound works ok with the built-in speakers on my Fujitsu laptop(amilo pro v3205). But if I plug in headphones in the audio out jack there is no sound in the headphones. With kernel 2.6.20 it worked ok. With 2.6.21 it doesn't. This BUG is reported in ALSA bugtracking system with ID 0003039. Patch that fixes this bug: diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 46e93c6..5edd330 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -636,7 +636,7 @@ static void cxt5045_hp_automute(struct hda_codec *codec) bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits); - snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits); + snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0, bits); } /* unsolicited event for HP jack sensing */ @@ -988,10 +988,10 @@ static void cxt5047_hp_automute(struct hda_codec *codec) bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits); - snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits); + snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0, bits); /* Mute/Unmute PCM 2 for good measure - some systems need this */ snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits); - snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits); + snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0, bits); } /* toggle input of built-in and mic jack appropriately */

2 2