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

Re: [alsa-devel] rme multiface I=>pccard error -12
by rmgls＠free.fr 04 Dec '07

04 Dec '07

> At Fri, 30 Nov 2007 15:11:08 +0100, > rmgls(a)free.fr wrote: >> >> >> Hello, >> >> on a laptop the old multiface I with a pccard (1) doesn't attach. >> acore returns error -12. >> >> details: >> dmesg: >> pccard: CardBus card inserted into slot 0 >> ALSA /root/alsa-driver-hg20071129/acore/init.c:174: cannot find the slot for index 0 (range 0-0), error: -16 > Check /proc/asound/cards. The index 0 is likely already used by > another device. Since the recent distro loads the sound drivers > automatically via udev, you'll have to set index for all drivers > properly. > If it's snd-hda-intel, add the option like below: > options snd-hda-intel index=1 > Takashi Hello Takashi, thanks for this info, and sorry for the noise. all worlks fine now. Best regards rmgls(a)free.fr

1 0

[alsa-devel] May be typos in the current ALSA?
by Andy Shevchenko 03 Dec '07

03 Dec '07

Hi! I think the following notices should be reviewed as a typo fix. Could you tell me do I wrong? /* patch_realtek.c */ ... static struct snd_pci_quirk alc861_cfg_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC861_3ST), SND_PCI_QUIRK(0x1043, 0x1335, "ASUS F2/3", ALC861_ASUS_LAPTOP), SND_PCI_QUIRK(0x1043, 0x1338, "ASUS F2/3", ALC861_ASUS_LAPTOP), SND_PCI_QUIRK(0x1043, 0x13d7, "ASUS A9rp", ALC861_ASUS_LAPTOP), >>> SND_PCI_QUIRK(0x1584, 0x9075, "Airis Praxis N1212", ALC861_ASUS_LAPTOP), SND_PCI_QUIRK(0x1043, 0x1393, "ASUS", ALC861_ASUS), SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS P1-AH2", ALC861_3ST_DIG), SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba", ALC861_TOSHIBA), /* FIXME: the entry below breaks Toshiba A100 (model=auto works!) * Any other models that need this preset? */ /* SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba", ALC861_TOSHIBA), */ SND_PCI_QUIRK(0x1584, 0x9072, "Uniwill m31", ALC861_UNIWILL_M31), >>> SND_PCI_QUIRK(0x1584, 0x9075, "Uniwill", ALC861_UNIWILL_M31), SND_PCI_QUIRK(0x1584, 0x2b01, "Uniwill X40AIx", ALC861_UNIWILL_M31), SND_PCI_QUIRK(0x1849, 0x0660, "Asrock 939SLI32", ALC660_3ST), SND_PCI_QUIRK(0x8086, 0xd600, "Intel", ALC861_3ST), SND_PCI_QUIRK(0x1462, 0x7254, "HP dx2200 (MSI MS-7254)", ALC861_3ST), SND_PCI_QUIRK(0x1462, 0x7297, "HP dx2250 (MSI MS-7297)", ALC861_3ST), {} }; ... The second record was added by myself (I filed bug report) when I discover RoverBook Voyager V200. First one was added later without checks. And the lines at the same file ... /* * generic initialization of ADC, input mixers and output mixers */ static struct hda_verb alc883_auto_init_verbs[] = { ... /* FIXME: use matrix-type input source selection */ /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */ /* Input mixer1 */ {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)}, /* {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, */ {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, /* Input mixer2 */ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)}, /* {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, */ >>> {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, { } }; The same initialization is present above in few lines. P.S. I've donloaded ALSA just few hours ago in daily snapshot tarball form. -- With best regards, Andy Shevchenko. mailto: andy(a)smile.org.ua

2 2

[alsa-devel] rme multiface I=>pccard error -12
by rmgls＠free.fr 03 Dec '07

03 Dec '07

Hello, on a laptop the old multiface I with a pccard (1) doesn't attach. acore returns error -12. details: dmesg: pccard: CardBus card inserted into slot 0 ALSA /root/alsa-driver-hg20071129/acore/init.c:174: cannot find the slot for index 0 (range 0-0), error: -16 RME Hammerfall DSP: probe of 0000:07:00.0 failed with error -12 config: machine: sony vaio s5 kernel 2-6-24-rc3 all alsa-*-hg as you seen. sound box: multiface I and pccard (I), the old one. Socket 0 Bridge: [yenta_cardbus] (bus ID: 0000:06:05.0) lspcmcia: Configuration: state: on ready: yes Voltage: 3.3V Vcc: 3.3V Vpp: 3.3V lspci -v 06:05.0 CardBus bridge: Texas Instruments PCI7420 CardBus Controller Subsystem: Sony Corporation Unknown device 818f Flags: bus master, medium devsel, latency 168, IRQ 17 Memory at b0008000 (32-bit, non-prefetchable) [size=4K] Bus: primary=06, secondary=07, subordinate=0a, sec-latency=176 Memory window 0: 50000000-53fff000 (prefetchable) Memory window 1: 54000000-57fff000 I/O window 0: 00002400-000024ff I/O window 1: 00002800-000028ff 16-bit legacy interface ports at 0001 07:00.0 Multimedia audio controller: Xilinx Corporation RME Hammerfall DSP (rev 10) Flags: medium devsel, IRQ 17 Memory at 54000000 (32-bit, non-prefetchable) [disabled] [size=64K] cat /dev/sndstat: ... 0: alc-260 any help would be appreciated. thanks. best regards raoul rmgls(a)free.fr

2 1

[alsa-devel] Patch - switching rate in STAC9460 codec of Prodigy192
by Pavel Hofman 03 Dec '07

03 Dec '07

Hi, Here is a patch for switching rate in STAC9460 codec. Thanks, Pavel. Signed-off-by: Pavel Hofman <dustin(a)seznam.cz> * support for switching rate in STAC9460 - using set_rate_val of the akm infrastructure * listing all STAC9460 registers in proc * disabling mpu401 device for Prodigy192 - otherwise the currently flawed mpu401 code hangs kernel when opening the midi device * removing old unused commented-out code

2 1

[alsa-devel] I2C fix for ice1724
by Pavel Hofman 03 Dec '07

03 Dec '07

Hello Takashi, Below is a patch for ice1724 I2C read code. Thanks, Pavel. Signed-off-by: Pavel Hofman <dustin(a)seznam.cz> * adding i2c busy wait before sending device address to prevent reading bogus data diff -r 7f4b25ff79d6 pci/ice1712/ice1724.c --- a/pci/ice1712/ice1724.c Fri Nov 30 17:59:25 2007 +0100 +++ b/pci/ice1712/ice1724.c Fri Nov 30 21:17:36 2007 +0100 @@ -1958,6 +1958,7 @@ unsigned char snd_vt1724_read_i2c(struct unsigned char val; mutex_lock(&ice->i2c_mutex); + wait_i2c_busy(ice); outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR)); outb(dev & ~VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR)); wait_i2c_busy(ice);

2 1

[alsa-devel] help
by YanBob 02 Dec '07

02 Dec '07

hello, my linux is ubuntu with Linux bob-laptop 2.6.22-14-generic #1 SMP Sun Oct 14 23:05:12 GMT 2007 i686 GNU/Linux. now the problem is that,no sound comes out when i use ubuntu. i have google some pages, and followed the steps as they said. But i turns out that my sound card is still not working. At the end of this email, i send you some inf. about my sound card. And my laptop model is Lenovo F41. Could you please help me? thanks a million!! bob@bob-laptop:~$ aplay -l **** PLAYBACK硬件设备列表 **** 卡 0: Intel [HDA Intel], 设备 0: ALC262 Analog [ALC262 Analog] 子设备: 1/1 子设备：#0: subdevice #0 卡 0: Intel [HDA Intel], 设备 1: ALC262 Digital [ALC262 Digital] 子设备: 1/1 子设备：#0: subdevice #0 卡 0: Intel [HDA Intel], 设备 6: Si3054 Modem [Si3054 Modem] 子设备: 1/1 子设备：#0: subdevice #0 bob@bob-laptop:~$ lspci -vv|grep Audio 00:1b.0 Audio device: Intel Corporation 82801H (ICH8 Family) HD Audio Controller (rev 03) bob@bob-laptop:~$ cat /proc/asound/cards 0 [Intel ]: HDA-Intel - HDA Intel HDA Intel at 0xf8300000 irq 22 bob@bob-laptop:~$ lsmod|grep snd snd_hda_intel 263712 1 snd_pcm_oss 44672 0 snd_mixer_oss 17664 1 snd_pcm_oss snd_pcm 80388 2 snd_hda_intel,snd_pcm_oss snd_seq_dummy 4740 0 snd_seq_oss 33152 0 snd_seq_midi 9600 0 snd_rawmidi 25728 1 snd_seq_midi snd_seq_midi_event 8448 2 snd_seq_oss,snd_seq_midi snd_seq 53232 6 snd_seq_dummy,snd_seq_oss,snd_seq_midi,snd_seq_midi_event snd_timer 24324 2 snd_pcm,snd_seq snd_seq_device 9228 5 snd_seq_dummy,snd_seq_oss,snd_seq_midi,snd_rawmidi,snd_seq snd 54660 11 snd_hda_intel,snd_pcm_oss,snd_mixer_oss,snd_pcm,snd_seq_oss,snd_rawmidi,snd_seq,snd_timer,snd_seq_device soundcore 8800 1 snd snd_page_alloc 11400 2 snd_hda_intel,snd_pcm bob@bob-laptop:~$ cat /proc/asound/version Advanced Linux Sound Architecture Driver Version 1.0.14 (Thu May 31 09:03:25 2007 UTC). ___________________________________________________________ 进入雅虎游戏嘉年华，赢取液晶显示器！ http://cn.mail.yahoo.com/promo/carnival07/

2 1

Re: [alsa-devel] multi pcm and mmap problem
by Takashi Iwai 02 Dec '07

02 Dec '07

At Wed, 21 Nov 2007 16:27:52 -0500, Tim wrote: > > On Wednesday 21 November 2007 06:01:22 am you wrote: > > At Wed, 21 Nov 2007 01:58:41 -0500, > > > > terminator356(a)users.sourceforge.net wrote: > > > After 2 years I've finally traced and fixed a problem > > > which was preventing me from using anything after > > > ALSA 1.0.9b ! > > > > > > In ALSA lib 1.0.9b: > > > pcm/pcm_generic.c: > > > int snd_pcm_generic_channel_info() > > > { > > > snd_pcm_generic_t *generic = pcm->private_data; > > > return snd_pcm_channel_info(generic->slave, info); > > > } > > > > > > But in ALSA lib 1.0.15: > > > pcm/pcm_generic.c: > > > int snd_pcm_generic_channel_info() > > > { > > > snd_pcm_generic_t *generic = pcm->private_data; > > > if (pcm->mmap_shadow) { > > > /* No own buffer is required - the plugin won't change > > > * the data on the buffer, or do safely on-the-place > > > * conversion > > > */ > > > return snd_pcm_channel_info(generic->slave, info); > > > } else { > > > // Tim: TESTED: This is now called instead of the other > > > one! /* Allocate own buffer */ > > > return snd_pcm_channel_info_shm(pcm, info, -1); > > > } > > > } > > > > > > My multi PCM consists of a plughw:0,2 and a hw:1,0 > > > In ALSA 1.0.9b, all five PCMs ALSA creates for this arrangement > > > create their areas with mmap(). And it works. > > > But in ALSA 1.0.15 my hw:1,0 and its multi PCM areas are > > > created with mmap(), and my plughw:0,2 and its PCMs areas > > > are created with malloc(). > > > Can't hear/record any sound from the plughw:0,2 part of the multi. > > > > > > I have verified that ALSA 1.0.15 is copying the plughw:0,2 HW PCM > > > areas to its LINEAR PCM areas, but NOT finally to its multi PCM areas. > > > It just copies all zeros. > > > That's the reason I hear/record no sound from the plughw:0,2 part > > > of the multi PCM. > > > So I reverted the function's code back to 1.0.9b and presto! > > > It works now, the same as in ALSA 1.0.9b > > > > > > So please tell me, am I missing something? > > > > Well, first of all, could you elaborate what is the real problem you > > are facing? Judging from your description above, it sounds like a > > clear bug, but I'm not sure where to start. > > > > In addition to the detailed bug description, a testcase program would > > be greatly helpful. > > > > OK. First, here's my simple testing .asoundrc : > pcm.multi_rec { > type multi; > slaves.a.pcm "hw:1,0"; > slaves.a.channels 12; > slaves.b.pcm "plughw:0,2"; > slaves.b.channels 16; > bindings.0.slave a; > bindings.0.channel 4; > bindings.1.slave b; > bindings.1.channel 10; > } > ctl.multi_rec { > type hw; > card 0; > } > > The two cards are SBLive! (emu10k1) and Delta1010LT (ice1712). > > And here is the command line I run: > arecord -I -v -t wav -c2 -r 48000 -f S32_LE -Dmulti_rec -d 3 \ > --buffer-size 128 arecord-multi-ice-emu.wav > > My problem is under ALSA 1.0.15 no sound is recorded from slave 'b' - > (the plughw:0,2 channel). > When I look at the two generated wav files, the first has data, and the second > has all zeros. > > So as I said before, I found that ALSA is copying data from the > plughw:0,2 HW PCM area to its LINEAR PCM area (i.e. the actual conversion > is taking place), but then somehow the data is not finally copied to its > multi slave b PCM area - just all zeros are copied. > Hence all zeros are stored in the second wav file. > > But with ALSA 1.0.9b, since all the areas are allocated with mmap(), > it works fine. It is only after ALSA 1.0.9b, that I get the problem. > Because ALSA 1.0.15 is allocating both the plughw:0,2 LINEAR PCM area > and multi slave slave b's PCM area with malloc(). > It seems ALSA doesn't want to copy to areas created with malloc(). OK, point taken. The problem is that the multi plugin creates unnecessary local buffer. It works somehow when the slave is a hw, but it doesn't for other types. Try the patch below. This should fix the problem. Now the multi plugin just shadows the slave buffers via mmap. > > > Should I add something more to my .asoundrc ? > > > I see that besides {type multi ... }, there is a {type share ...} > > > defined. *** Does the 'share' have any use here? Can't find any docs on > > > it. > > > > The share type is used only for share plugin, so you can ignore it. > > > > > Also: > > > Yes, I can see now, why you made this code change. > > > mmap() has limits, so you switched over to malloc(). > > > Those limits force the user to use small buffers > > > and/or reduce the number of channels created. > > > > No, mmap was never used between plugins. It was only for the hw layer > > even in the earlier verson. In the earlier version, SHM was used > > instead. But, the plugin buffer is referred only locally, so it makes > > no sense to use SHM for that. That's why now it was switched to > > malloc. (snd_pcm_channel_info_shm() is a rest of the old behavior, > > and thus its name is confusing...) > > > My point was this: > Under ALSA 1.0.9b, (and with my fix to ALSA 1.0.15 to force it to use > mmap() always - see above), if I run: > arecord -I -v -t wav -c2 -r 48000 -f S32_LE -Dmulti_rec -d 3 \ > --buffer-size 128 arecord-multi-ice-emu.wav > it will run. But if I run > arecord -I -v -t wav -c2 -r 48000 -f S32_LE -Dmulti_rec -d 3 \ > --buffer-size 256 arecord-multi-ice-emu.wav > it fails with "mmap() failed: Invalid argument". > I quadrupled the available locked memory with a line in > /etc/security/limits.conf > * - memlock 128 > but the second command line still fails. > What am I doing wrong? How can I increase mmap() limits? It must be irrelevant now... Takashi diff -r 3539f279ec38 src/pcm/pcm_multi.c --- a/src/pcm/pcm_multi.c Wed Nov 21 12:19:43 2007 +0100 +++ b/src/pcm/pcm_multi.c Fri Nov 23 14:40:39 2007 +0100 @@ -690,13 +690,43 @@ static snd_pcm_sframes_t snd_pcm_multi_m return size; } -static int snd_pcm_multi_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED) +static int snd_pcm_multi_munmap(snd_pcm_t *pcm) { + free(pcm->mmap_channels); + free(pcm->running_areas); + pcm->mmap_channels = NULL; + pcm->running_areas = NULL; return 0; } -static int snd_pcm_multi_munmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED) +static int snd_pcm_multi_mmap(snd_pcm_t *pcm) { + snd_pcm_multi_t *multi = pcm->private_data; + unsigned int c; + + pcm->mmap_channels = calloc(pcm->channels, + sizeof(pcm->mmap_channels[0])); + pcm->running_areas = calloc(pcm->channels, + sizeof(pcm->running_areas[0])); + if (!pcm->mmap_channels || !pcm->running_areas) { + snd_pcm_multi_munmap(pcm); + return -ENOMEM; + } + + /* Copy the slave mmapped buffer data */ + for (c = 0; c < pcm->channels; c++) { + snd_pcm_multi_channel_t *chan = &multi->channels[c]; + snd_pcm_t *slave; + if (chan->slave_idx < 0) { + snd_pcm_multi_munmap(pcm); + return -ENXIO; + } + slave = multi->slaves[chan->slave_idx].pcm; + pcm->mmap_channels[c] = + slave->mmap_channels[chan->slave_channel]; + pcm->running_areas[c] = + slave->running_areas[chan->slave_channel]; + } return 0; } @@ -850,6 +880,7 @@ int snd_pcm_multi_open(snd_pcm_t **pcmp, return err; } pcm->mmap_rw = 1; + pcm->mmap_shadow = 1; /* has own mmap method */ pcm->ops = &snd_pcm_multi_ops; pcm->fast_ops = &snd_pcm_multi_fast_ops; pcm->private_data = multi;

3 9

[alsa-devel] Why is a USB capture device showing up in "aplay -L"?
by Chris Rankin 01 Dec '07

01 Dec '07

Hi, I have a webcam which has microphone-only USB audio capability. However, not only has this device stopped recording anything but it has also vanished from the "arecord -L" list and appeared in the "aplay -L" one instead: $ arecord -L default:CARD=Audigy2 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Default Audio Device front:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Front speakers rear:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Rear speakers center_lfe:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Center and Subwoofer speakers side:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Side speakers surround40:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 4.0 Surround output to Front and Rear speakers surround41:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback IEC958 (S/PDIF) Digital Audio Output null Discard all samples (playback) or generate zero samples (capture) and: $ aplay -L default:CARD=Audigy2 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Default Audio Device front:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Front speakers rear:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Rear speakers center_lfe:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Center and Subwoofer speakers side:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback Side speakers surround40:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 4.0 Surround output to Front and Rear speakers surround41:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=Audigy2,DEV=0 Audigy 2 ZS [SB0353], ADC Capture/Standard PCM Playback IEC958 (S/PDIF) Digital Audio Output null Discard all samples (playback) or generate zero samples (capture) default:CARD=WebCam USB Device 0x46d:0x8b4, USB Audio Default Audio Device front:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio Front speakers surround40:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio 4.0 Surround output to Front and Rear speakers surround41:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=WebCam,DEV=0 USB Device 0x46d:0x8b4, USB Audio IEC958 (S/PDIF) Digital Audio Output Here is my .asoundrc file: ctl.Audigy2 { type hw card 0 } pcm.Audigy2 { type plug slave { pcm "hw:0,0" } } ctl.webcam { type hw card 1 } pcm.webcam { type plug slave { pcm "hw:1,0" } } and here is what /proc/asound looks like: ]$ ls -als /proc/asound/ total 0 0 dr-xr-xr-x 6 root root 0 2007-12-01 15:55 . 0 dr-xr-xr-x 172 root root 0 2007-12-01 14:37 .. 0 lrwxrwxrwx 1 root root 5 2007-12-01 15:55 Audigy2 -> card0 0 dr-xr-xr-x 11 root root 0 2007-12-01 15:55 card0 0 dr-xr-xr-x 3 root root 0 2007-12-01 15:55 card1 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 cards 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 devices 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 hwdep 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 modules 0 dr-xr-xr-x 2 root root 0 2007-12-01 15:55 oss 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 pcm 0 dr-xr-xr-x 2 root root 0 2007-12-01 15:55 seq 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 timers 0 -r--r--r-- 1 root root 0 2007-12-01 15:55 version 0 lrwxrwxrwx 1 root root 5 2007-12-01 15:55 WebCam -> card1 This happens with both Fedora 7 and Fedora 8. Could there be a problem with the snd-usb-audio kernel module, please? Cheers, Chris ___________________________________________________________ Yahoo! Answers - Got a question? Someone out there knows the answer. Try it now. http://uk.answers.yahoo.com/

1 0

Re: [alsa-devel] alsa-devel on vger
by Jaroslav Kysela 30 Nov '07

30 Nov '07

On Thu, 22 Nov 2007, Takashi Iwai wrote: > At Wed, 21 Nov 2007 20:14:34 +0100 (CET), > Jaroslav Kysela wrote: > > > > On Wed, 21 Nov 2007, Rene Herman wrote: > > > > > On 21-11-07 17:54, Takashi Iwai wrote: > > > > > > > What about the plan to move alsa-devel to vger? > > > > Shouldn't we do that soon? > > > > > > Jaroslav hasn't yet pointed alsa-devel(a)alsa-project.org at vger. > > > It's a little unfortunate that David wouldn't just transfer > > > subscriptions as it seems that's where things stalled again. Given > > > our still recent move from sourceforge it really should be okay to > > > just move everyone over. > > > > > > I noticed that the entirety of people thanking David for setting up > > > the list consisted of alsa-devel moderators, you and me, and I > > > suspect most other subscribers don't feel there's actually much > > > wrong with things as they are today and mostly consider moving again > > > a nuisance. The one other reaction to the move was a slightly > > > annoyed reaction about the re-subscribing... > > > > I'm playing with idea to redirect alsa-devel(a)alsa-project.org to vger and > > leave current mailing list (which is subscribed to vger now too). So every > > e-mail to this list will go through vger, and resubscription will be only > > choice of subscriber. Opinions? > > A couple of things: > > - the official address (on kernel tree and wiki) should be vger, not > alsa-project.org, and promote to re-subscribe. Changing e-mail address of list is something I don't want. The official e-mail address for alsa-devel mailing list was always alsa-devel(a)alsa-project.org (even in time when this list was on sourceforge). Unfortunately, vger mailing list does not accept simple redirected e-mails from alsa-devel(a)alsa-project.org so I postponed any actions. > - open alsa-project.org list again. I'll stop list admin works. I tried to count some statistics and at the time spamassassin and mailman filtering rules catch 92% of spam messages coming to alsa-devel. Unfortunately remaining 8% means 20 spam messages daily (without moderation). Could moderators confirm this value? Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project

3 7

[alsa-devel] [PATCH] sound/isa: kill pnp_resource_change.
by Rene Herman 30 Nov '07

30 Nov '07

Hi Takashi. This removes the pnp_resource_change use from the ALSA ISAPnP drivers. In 2.4 these were useful in providing an easy path to setting the resources, but in 2.6 they retain function as a layering violation only. This makes for a nice cleanup (-550 lines) of ALSA but moreover, ALSA is the only remaining user of pnp_init_resource_table(), pnp_resource_change() and pnp_manual_config_dev() (and, in fact, of "struct pnp_resource_table") in the tree outide of drivers/pnp itself meaning it makes for more cleanup potential inside the PnP layer. Thomas Renninger acked their removal from that side, you did from the ALSA side (CC list just copied from that thread). Against current alsa-kernel HG. Many more potential cleanups in there, but this _only_ removes the pnp_resource_change code. Compile tested against current alsa-kernel HG and compile- and use-tested against 2.6.23.x (few offsets). Signed-off-by: Rene Herman <rene.herman(a)gmail.com> Documentation/ALSA-Configuration.txt | 35 ------------ isa/ad1816a/ad1816a.c | 55 ++----------------- isa/als100.c | 49 ---------------- isa/azt2320.c | 50 ----------------- isa/cmi8330.c | 42 +------------- isa/cs423x/cs4236.c | 101 +++++++---------------------------- isa/dt019x.c | 48 +--------------- isa/es18xx.c | 58 +++----------------- isa/gus/interwave.c | 39 +------------ isa/opl3sa2.c | 36 ------------ isa/opti9xx/opti92x-ad1848.c | 50 +---------------- isa/sb/es968.c | 27 --------- isa/sb/sb16.c | 39 ------------- isa/wavefront/wavefront.c | 55 +------------------ 14 files changed, 65 insertions(+), 619 deletions(-) diff --git a/Documentation/ALSA-Configuration.txt b/Documentation/ALSA-Configuration.txt --- a/Documentation/ALSA-Configuration.txt +++ b/Documentation/ALSA-Configuration.txt @@ -150,13 +150,6 @@ Prior to version 0.9.0rc4 options had a Module for sound cards based on Analog Devices AD1816A/AD1815 ISA chips. - port - port # for AD1816A chip (PnP setup) - mpu_port - port # for MPU-401 UART (PnP setup) - fm_port - port # for OPL3 (PnP setup) - irq - IRQ # for AD1816A chip (PnP setup) - mpu_irq - IRQ # for MPU-401 UART (PnP setup) - dma1 - first DMA # for AD1816A chip (PnP setup) - dma2 - second DMA # for AD1816A chip (PnP setup) clockfreq - Clock frequency for AD1816A chip (default = 0, 33000Hz) This module supports multiple cards, autoprobe and PnP. @@ -203,14 +196,6 @@ Prior to version 0.9.0rc4 options had a Module for sound cards based on Avance Logic ALS100/ALS120 ISA chips. - port - port # for ALS100 (SB16) chip (PnP setup) - irq - IRQ # for ALS100 (SB16) chip (PnP setup) - dma8 - 8-bit DMA # for ALS100 (SB16) chip (PnP setup) - dma16 - 16-bit DMA # for ALS100 (SB16) chip (PnP setup) - mpu_port - port # for MPU-401 UART (PnP setup) - mpu_irq - IRQ # for MPU-401 (PnP setup) - fm_port - port # for OPL3 FM (PnP setup) - This module supports multiple cards, autoprobe and PnP. The power-management is supported. @@ -304,15 +289,6 @@ Prior to version 0.9.0rc4 options had a Module for sound cards based on Aztech System AZT2320 ISA chip (PnP only). - port - port # for AZT2320 chip (PnP setup) - wss_port - port # for WSS (PnP setup) - mpu_port - port # for MPU-401 UART (PnP setup) - fm_port - FM port # for AZT2320 chip (PnP setup) - irq - IRQ # for AZT2320 (WSS) chip (PnP setup) - mpu_irq - IRQ # for MPU-401 UART (PnP setup) - dma1 - 1st DMA # for AZT2320 (WSS) chip (PnP setup) - dma2 - 2nd DMA # for AZT2320 (WSS) chip (PnP setup) - This module supports multiple cards, PnP and autoprobe. The power-management is supported. @@ -504,13 +480,6 @@ Prior to version 0.9.0rc4 options had a Module for Diamond Technologies DT-019X / Avance Logic ALS-007 (PnP only) - - port - Port # (PnP setup) - mpu_port - Port # for MPU-401 (PnP setup) - fm_port - Port # for FM OPL-3 (PnP setup) - irq - IRQ # (PnP setup) - mpu_irq - IRQ # for MPU-401 (PnP setup) - dma8 - DMA # (PnP setup) This module supports multiple cards. This module is enabled only with ISA PnP support. @@ -609,10 +578,6 @@ Prior to version 0.9.0rc4 options had a Module for sound cards based on ESS ES968 chip (PnP only). - port - port # for ES968 (SB8) chip (PnP setup) - irq - IRQ # for ES968 (SB8) chip (PnP setup) - dma1 - DMA # for ES968 (SB8) chip (PnP setup) - This module supports multiple cards, PnP and autoprobe. The power-management is supported. diff --git a/isa/ad1816a/ad1816a.c b/isa/ad1816a/ad1816a.c --- a/isa/ad1816a/ad1816a.c +++ b/isa/ad1816a/ad1816a.c @@ -61,20 +61,6 @@ MODULE_PARM_DESC(id, "ID string for ad18 MODULE_PARM_DESC(id, "ID string for ad1816a based soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable ad1816a based soundcard."); -module_param_array(port, long, NULL, 0444); -MODULE_PARM_DESC(port, "Port # for ad1816a driver."); -module_param_array(mpu_port, long, NULL, 0444); -MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ad1816a driver."); -module_param_array(fm_port, long, NULL, 0444); -MODULE_PARM_DESC(fm_port, "FM port # for ad1816a driver."); -module_param_array(irq, int, NULL, 0444); -MODULE_PARM_DESC(irq, "IRQ # for ad1816a driver."); -module_param_array(mpu_irq, int, NULL, 0444); -MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ad1816a driver."); -module_param_array(dma1, int, NULL, 0444); -MODULE_PARM_DESC(dma1, "1st DMA # for ad1816a driver."); -module_param_array(dma2, int, NULL, 0444); -MODULE_PARM_DESC(dma2, "2nd DMA # for ad1816a driver."); module_param_array(clockfreq, int, NULL, 0444); MODULE_PARM_DESC(clockfreq, "Clock frequency for ad1816a driver (default = 0)."); @@ -117,16 +103,12 @@ static int __devinit snd_card_ad1816a_pn const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree(cfg); + if (acard->dev == NULL) return -EBUSY; - } + acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL); if (acard->devmpu == NULL) { mpu_port[dev] = -1; @@ -134,25 +116,10 @@ static int __devinit snd_card_ad1816a_pn } pdev = acard->dev; - pnp_init_resource_table(cfg); - - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], port[dev], 16); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4); - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { printk(KERN_ERR PFX "AUDIO PnP configure failure\n"); - kfree(cfg); return -EBUSY; } @@ -162,20 +129,11 @@ static int __devinit snd_card_ad1816a_pn dma2[dev] = pnp_dma(pdev, 1); irq[dev] = pnp_irq(pdev, 0); - if (acard->devmpu == NULL) { - kfree(cfg); + if (acard->devmpu == NULL) return 0; - } + pdev = acard->devmpu; - pnp_init_resource_table(cfg); - - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2); - if (mpu_irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1); - - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { printk(KERN_ERR PFX "MPU401 PnP configure failure\n"); @@ -186,7 +144,6 @@ static int __devinit snd_card_ad1816a_pn mpu_irq[dev] = pnp_irq(pdev, 0); } - kfree(cfg); return 0; } diff --git a/isa/als100.c b/isa/als100.c --- a/isa/als100.c +++ b/isa/als100.c @@ -63,20 +63,6 @@ MODULE_PARM_DESC(id, "ID string for als1 MODULE_PARM_DESC(id, "ID string for als100 based soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable als100 based soundcard."); -module_param_array(port, long, NULL, 0444); -MODULE_PARM_DESC(port, "Port # for als100 driver."); -module_param_array(mpu_port, long, NULL, 0444); -MODULE_PARM_DESC(mpu_port, "MPU-401 port # for als100 driver."); -module_param_array(fm_port, long, NULL, 0444); -MODULE_PARM_DESC(fm_port, "FM port # for als100 driver."); -module_param_array(irq, int, NULL, 0444); -MODULE_PARM_DESC(irq, "IRQ # for als100 driver."); -module_param_array(mpu_irq, int, NULL, 0444); -MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for als100 driver."); -module_param_array(dma8, int, NULL, 0444); -MODULE_PARM_DESC(dma8, "8-bit DMA # for als100 driver."); -module_param_array(dma16, int, NULL, 0444); -MODULE_PARM_DESC(dma16, "16-bit DMA # for als100 driver."); struct snd_card_als100 { int dev_no; @@ -111,38 +97,20 @@ static int __devinit snd_card_als100_pnp const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree(cfg); + if (acard->dev == NULL) return -ENODEV; - } + acard->devmpu = pnp_request_card_device(card, id->devs[1].id, acard->dev); acard->devopl = pnp_request_card_device(card, id->devs[2].id, acard->dev); pdev = acard->dev; - pnp_init_resource_table(cfg); - - /* override resources */ - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - if (dma8[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1); - if (dma16[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma16[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n"); - kfree(cfg); return err; } port[dev] = pnp_port_start(pdev, 0); @@ -152,13 +120,6 @@ static int __devinit snd_card_als100_pnp pdev = acard->devmpu; if (pdev != NULL) { - pnp_init_resource_table(cfg); - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2); - if (mpu_irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "MPU401 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) goto __mpu_error; @@ -176,11 +137,6 @@ static int __devinit snd_card_als100_pnp pdev = acard->devopl; if (pdev != NULL) { - pnp_init_resource_table(cfg); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], fm_port[dev], 4); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "OPL3 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) goto __fm_error; @@ -195,7 +151,6 @@ static int __devinit snd_card_als100_pnp fm_port[dev] = -1; } - kfree(cfg); return 0; } diff --git a/isa/azt2320.c b/isa/azt2320.c --- a/isa/azt2320.c +++ b/isa/azt2320.c @@ -72,22 +72,6 @@ MODULE_PARM_DESC(id, "ID string for azt2 MODULE_PARM_DESC(id, "ID string for azt2320 based soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable azt2320 based soundcard."); -module_param_array(port, long, NULL, 0444); -MODULE_PARM_DESC(port, "Port # for azt2320 driver."); -module_param_array(wss_port, long, NULL, 0444); -MODULE_PARM_DESC(wss_port, "WSS Port # for azt2320 driver."); -module_param_array(mpu_port, long, NULL, 0444); -MODULE_PARM_DESC(mpu_port, "MPU-401 port # for azt2320 driver."); -module_param_array(fm_port, long, NULL, 0444); -MODULE_PARM_DESC(fm_port, "FM port # for azt2320 driver."); -module_param_array(irq, int, NULL, 0444); -MODULE_PARM_DESC(irq, "IRQ # for azt2320 driver."); -module_param_array(mpu_irq, int, NULL, 0444); -MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for azt2320 driver."); -module_param_array(dma1, int, NULL, 0444); -MODULE_PARM_DESC(dma1, "1st DMA # for azt2320 driver."); -module_param_array(dma2, int, NULL, 0444); -MODULE_PARM_DESC(dma2, "2nd DMA # for azt2320 driver."); struct snd_card_azt2320 { int dev_no; @@ -121,43 +105,19 @@ static int __devinit snd_card_azt2320_pn const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; - acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree(cfg); + if (acard->dev == NULL) return -ENODEV; - } acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL); pdev = acard->dev; - pnp_init_resource_table(cfg); - - /* override resources */ - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4); - if (wss_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], wss_port[dev], 4); - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n"); - kfree(cfg); return err; } port[dev] = pnp_port_start(pdev, 0); @@ -169,13 +129,6 @@ static int __devinit snd_card_azt2320_pn pdev = acard->devmpu; if (pdev != NULL) { - pnp_init_resource_table(cfg); - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2); - if (mpu_irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "MPU401 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) goto __mpu_error; @@ -191,7 +144,6 @@ static int __devinit snd_card_azt2320_pn mpu_port[dev] = -1; } - kfree (cfg); return 0; } diff --git a/isa/cmi8330.c b/isa/cmi8330.c --- a/isa/cmi8330.c +++ b/isa/cmi8330.c @@ -286,39 +286,21 @@ static int __devinit snd_cmi8330_pnp(int const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; acard->cap = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->cap == NULL) { - kfree(cfg); + if (acard->cap == NULL) return -EBUSY; - } + acard->play = pnp_request_card_device(card, id->devs[1].id, NULL); - if (acard->play == NULL) { - kfree(cfg); + if (acard->play == NULL) return -EBUSY; - } pdev = acard->cap; - pnp_init_resource_table(cfg); - /* allocate AD1848 resources */ - if (wssport[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], wssport[dev], 8); - if (wssdma[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], wssdma[dev], 1); - if (wssirq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], wssirq[dev], 1); - - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP manual resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP configure failure\n"); - kfree(cfg); return -EBUSY; } wssport[dev] = pnp_port_start(pdev, 0); @@ -327,23 +309,10 @@ static int __devinit snd_cmi8330_pnp(int /* allocate SB16 resources */ pdev = acard->play; - pnp_init_resource_table(cfg); - if (sbport[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], sbport[dev], 16); - if (sbdma8[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], sbdma8[dev], 1); - if (sbdma16[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], sbdma16[dev], 1); - if (sbirq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], sbirq[dev], 1); - - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_ERR "CMI8330/C3D (SB16) PnP manual resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "CMI8330/C3D (SB16) PnP configure failure\n"); - kfree(cfg); return -EBUSY; } sbport[dev] = pnp_port_start(pdev, 0); @@ -351,7 +320,6 @@ static int __devinit snd_cmi8330_pnp(int sbdma16[dev] = pnp_dma(pdev, 1); sbirq[dev] = pnp_irq(pdev, 0); - kfree(cfg); return 0; } #endif diff --git a/isa/cs423x/cs4236.c b/isa/cs423x/cs4236.c --- a/isa/cs423x/cs4236.c +++ b/isa/cs423x/cs4236.c @@ -270,29 +270,9 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cs423x MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids); /* WSS initialization */ -static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev, - struct pnp_resource_table *cfg) -{ - int err; - - pnp_init_resource_table(cfg); - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 4); - if (fm_port[dev] != SNDRV_AUTO_PORT && fm_port[dev] > 0) - pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4); - if (sb_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], sb_port[dev], 16); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev] < 0 ? 4 : dma2[dev], 1); - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_ERR IDENT " WSS PnP manual resources are invalid, using auto config\n"); - err = pnp_activate_dev(pdev); - if (err < 0) { +static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev) +{ + if (pnp_activate_dev(pdev) < 0) { printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n"); return -EBUSY; } @@ -311,19 +291,9 @@ static int __devinit snd_cs423x_pnp_init } /* CTRL initialization */ -static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev, - struct pnp_resource_table *cfg) -{ - int err; - - pnp_init_resource_table(cfg); - if (cport[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], cport[dev], 8); - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_ERR IDENT " CTRL PnP manual resources are invalid, using auto config\n"); - err = pnp_activate_dev(pdev); - if (err < 0) { +static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev) +{ + if (pnp_activate_dev(pdev) < 0) { printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n"); return -EBUSY; } @@ -333,21 +303,9 @@ static int __devinit snd_cs423x_pnp_init } /* MPU initialization */ -static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev, - struct pnp_resource_table *cfg) -{ - int err; - - pnp_init_resource_table(cfg); - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2); - if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0) - pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1); - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_ERR IDENT " MPU401 PnP manual resources are invalid, using auto config\n"); - err = pnp_activate_dev(pdev); - if (err < 0) { +static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) +{ + if (pnp_activate_dev(pdev) < 0) { printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n"); mpu_port[dev] = SNDRV_AUTO_PORT; mpu_irq[dev] = SNDRV_AUTO_IRQ; @@ -368,15 +326,8 @@ static int __devinit snd_card_cs4232_pnp static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard, struct pnp_dev *pdev) { - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); - - if (!cfg) - return -ENOMEM; - if (snd_cs423x_pnp_init_wss(dev, acard->wss, cfg) < 0) { - kfree(cfg); + if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0) return -EBUSY; - } - kfree(cfg); cport[dev] = -1; return 0; } @@ -386,43 +337,33 @@ static int __devinit snd_card_cs423x_pnp struct pnp_card_link *card, const struct pnp_card_device_id *id) { - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); - - if (!cfg) - return -ENOMEM; - acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL); if (acard->wss == NULL) - goto error; + return -EBUSY; acard->ctrl = pnp_request_card_device(card, id->devs[1].id, NULL); if (acard->ctrl == NULL) - goto error; + return -EBUSY; if (id->devs[2].id[0]) { acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL); if (acard->mpu == NULL) - goto error; + return -EBUSY; } /* WSS initialization */ - if (snd_cs423x_pnp_init_wss(dev, acard->wss, cfg) < 0) - goto error; + if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0) + return -EBUSY; /* CTRL initialization */ if (acard->ctrl && cport[dev] > 0) { - if (snd_cs423x_pnp_init_ctrl(dev, acard->ctrl, cfg) < 0) - goto error; + if (snd_cs423x_pnp_init_ctrl(dev, acard->ctrl) < 0) + return -EBUSY; } /* MPU initialization */ if (acard->mpu && mpu_port[dev] > 0) { - if (snd_cs423x_pnp_init_mpu(dev, acard->mpu, cfg) < 0) - goto error; - } - kfree(cfg); - return 0; - - error: - kfree(cfg); - return -EBUSY; + if (snd_cs423x_pnp_init_mpu(dev, acard->mpu) < 0) + return -EBUSY; + } + return 0; } #endif /* CONFIG_PNP */ diff --git a/isa/dt019x.c b/isa/dt019x.c --- a/isa/dt019x.c +++ b/isa/dt019x.c @@ -56,18 +56,6 @@ MODULE_PARM_DESC(id, "ID string for DT-0 MODULE_PARM_DESC(id, "ID string for DT-019X based soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable DT-019X based soundcard."); -module_param_array(port, long, NULL, 0444); -MODULE_PARM_DESC(port, "Port # for dt019x driver."); -module_param_array(mpu_port, long, NULL, 0444); -MODULE_PARM_DESC(mpu_port, "MPU-401 port # for dt019x driver."); -module_param_array(fm_port, long, NULL, 0444); -MODULE_PARM_DESC(fm_port, "FM port # for dt019x driver."); -module_param_array(irq, int, NULL, 0444); -MODULE_PARM_DESC(irq, "IRQ # for dt019x driver."); -module_param_array(mpu_irq, int, NULL, 0444); -MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for dt019x driver."); -module_param_array(dma8, int, NULL, 0444); -MODULE_PARM_DESC(dma8, "8-bit DMA # for dt019x driver."); struct snd_card_dt019x { struct pnp_dev *dev; @@ -95,36 +83,20 @@ static int __devinit snd_card_dt019x_pnp const struct pnp_card_device_id *pid) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; - acard->dev = pnp_request_card_device(card, pid->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree (cfg); + if (acard->dev == NULL) return -ENODEV; - } + acard->devmpu = pnp_request_card_device(card, pid->devs[1].id, NULL); acard->devopl = pnp_request_card_device(card, pid->devs[2].id, NULL); pdev = acard->dev; - pnp_init_resource_table(cfg); - - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - if (dma8[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "DT-019X AUDIO the requested resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR PFX "DT-019X AUDIO pnp configure failure\n"); - kfree(cfg); return err; } @@ -135,15 +107,7 @@ static int __devinit snd_card_dt019x_pnp port[dev],irq[dev],dma8[dev]); pdev = acard->devmpu; - if (pdev != NULL) { - pnp_init_resource_table(cfg); - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2); - if (mpu_irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "DT-019X MPU401 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { pnp_release_card_device(pdev); @@ -162,11 +126,6 @@ static int __devinit snd_card_dt019x_pnp pdev = acard->devopl; if (pdev != NULL) { - pnp_init_resource_table(cfg); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], fm_port[dev], 4); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "DT-019X OPL3 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { pnp_release_card_device(pdev); @@ -181,7 +140,6 @@ static int __devinit snd_card_dt019x_pnp fm_port[dev] = -1; } - kfree(cfg); return 0; } diff --git a/isa/es18xx.c b/isa/es18xx.c --- a/isa/es18xx.c +++ b/isa/es18xx.c @@ -2035,31 +2035,9 @@ MODULE_DEVICE_TABLE(pnp, snd_audiodrive_ MODULE_DEVICE_TABLE(pnp, snd_audiodrive_pnpbiosids); /* PnP main device initialization */ -static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev, - struct pnp_resource_table *cfg) -{ - int err; - - pnp_init_resource_table(cfg); - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4); - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], mpu_port[dev], 2); - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if (pnp_device_is_isapnp(pdev)) { - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_ERR PFX "PnP manual resources are invalid, using auto config\n"); - } - err = pnp_activate_dev(pdev); - if (err < 0) { +static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev) +{ + if (pnp_activate_dev(pdev) < 0) { snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n"); return -EBUSY; } @@ -2087,16 +2065,9 @@ static int __devinit snd_audiodrive_pnp( static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, struct pnp_dev *pdev) { - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); - - if (!cfg) - return -ENOMEM; acard->dev = pdev; - if (snd_audiodrive_pnp_init_main(dev, acard->dev, cfg) < 0) { - kfree(cfg); + if (snd_audiodrive_pnp_init_main(dev, acard->dev) < 0) return -EBUSY; - } - kfree(cfg); return 0; } @@ -2125,33 +2096,24 @@ static int __devinit snd_audiodrive_pnpc struct pnp_card_link *card, const struct pnp_card_device_id *id) { - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); - - if (!cfg) - return -ENOMEM; acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree(cfg); + if (acard->dev == NULL) return -EBUSY; - } + acard->devc = pnp_request_card_device(card, id->devs[1].id, NULL); - if (acard->devc == NULL) { - kfree(cfg); + if (acard->devc == NULL) return -EBUSY; - } + /* Control port initialization */ if (pnp_activate_dev(acard->devc) < 0) { - kfree(cfg); snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n"); return -EAGAIN; } snd_printdd("pnp: port=0x%llx\n", (unsigned long long)pnp_port_start(acard->devc, 0)); - if (snd_audiodrive_pnp_init_main(dev, acard->dev, cfg) < 0) { - kfree(cfg); + if (snd_audiodrive_pnp_init_main(dev, acard->dev) < 0) return -EBUSY; - } - kfree(cfg); + return 0; } #endif /* CONFIG_PNP */ diff --git a/isa/gus/interwave.c b/isa/gus/interwave.c --- a/isa/gus/interwave.c +++ b/isa/gus/interwave.c @@ -560,50 +560,27 @@ static int __devinit snd_interwave_pnp(i const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; iwcard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (iwcard->dev == NULL) { - kfree(cfg); + if (iwcard->dev == NULL) return -EBUSY; - } + #ifdef SNDRV_STB iwcard->devtc = pnp_request_card_device(card, id->devs[1].id, NULL); - if (iwcard->devtc == NULL) { - kfree(cfg); + if (iwcard->devtc == NULL) return -EBUSY; - } #endif /* Synth & Codec initialization */ pdev = iwcard->dev; - pnp_init_resource_table(cfg); - if (port[dev] != SNDRV_AUTO_PORT) { - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - pnp_resource_change(&cfg->port_resource[1], port[dev] + 0x100, 12); - pnp_resource_change(&cfg->port_resource[2], port[dev] + 0x10c, 4); - } - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1); - if (dma2[dev] < 0) - pnp_resource_change(&cfg->dma_resource[1], 4, 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "InterWave - Synth - the requested resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { - kfree(cfg); snd_printk(KERN_ERR "InterWave PnP configure failure (out of resources?)\n"); return err; } if (pnp_port_start(pdev, 0) + 0x100 != pnp_port_start(pdev, 1) || pnp_port_start(pdev, 0) + 0x10c != pnp_port_start(pdev, 2)) { - kfree(cfg); snd_printk(KERN_ERR "PnP configure failure (wrong ports)\n"); return -ENOENT; } @@ -620,21 +597,15 @@ static int __devinit snd_interwave_pnp(i #ifdef SNDRV_STB /* Tone Control initialization */ pdev = iwcard->devtc; - pnp_init_resource_table(cfg); - if (port_tc[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port_tc[dev], 1); - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "InterWave - ToneControl - the requested resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { - kfree(cfg); snd_printk(KERN_ERR "InterWave ToneControl PnP configure failure (out of resources?)\n"); return err; } port_tc[dev] = pnp_port_start(pdev, 0); snd_printdd("isapnp IW: tone control port=0x%lx\n", port_tc[dev]); #endif - kfree(cfg); return 0; } #endif /* CONFIG_PNP */ diff --git a/isa/opl3sa2.c b/isa/opl3sa2.c --- a/isa/opl3sa2.c +++ b/isa/opl3sa2.c @@ -610,39 +610,8 @@ static int __devinit snd_opl3sa2_pnp(int static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip, struct pnp_dev *pdev) { - struct pnp_resource_table * cfg; - int err; - - cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); - if (!cfg) { - snd_printk(KERN_ERR PFX "cannot allocate pnp cfg\n"); - return -ENOMEM; - } - /* PnP initialization */ - pnp_init_resource_table(cfg); - if (sb_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], sb_port[dev], 16); - if (wss_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], wss_port[dev], 8); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], fm_port[dev], 4); - if (midi_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[3], midi_port[dev], 2); - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[4], port[dev], 2); - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - err = pnp_manual_config_dev(pdev, cfg, 0); - if (err < 0) - snd_printk(KERN_WARNING "PnP manual resources are invalid, using auto config\n"); - err = pnp_activate_dev(pdev); - if (err < 0) { - kfree(cfg); - snd_printk(KERN_ERR "PnP configure failure (out of resources?) err = %d\n", err); + if (pnp_activate_dev(pdev) < 0) { + snd_printk(KERN_ERR "PnP configure failure (out of resources?)\n"); return -EBUSY; } sb_port[dev] = pnp_port_start(pdev, 0); @@ -657,7 +626,6 @@ static int __devinit snd_opl3sa2_pnp(int pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", sb_port[dev], wss_port[dev], fm_port[dev], midi_port[dev]); snd_printdd("%sPnP OPL3-SA: control port=0x%lx, dma1=%i, dma2=%i, irq=%i\n", pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", port[dev], dma1[dev], dma2[dev], irq[dev]); - kfree(cfg); return 0; } #endif /* CONFIG_PNP */ diff --git a/isa/opti9xx/opti92x-ad1848.c b/isa/opti9xx/opti92x-ad1848.c --- a/isa/opti9xx/opti92x-ad1848.c +++ b/isa/opti9xx/opti92x-ad1848.c @@ -1690,53 +1690,19 @@ static int __devinit snd_card_opti9xx_pn const struct pnp_card_device_id *pid) { struct pnp_dev *pdev; - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; chip->dev = pnp_request_card_device(card, pid->devs[0].id, NULL); - if (chip->dev == NULL) { - kfree(cfg); + if (chip->dev == NULL) return -EBUSY; - } + chip->devmpu = pnp_request_card_device(card, pid->devs[1].id, NULL); pdev = chip->dev; - pnp_init_resource_table(cfg); - -#ifdef OPTi93X - if (port != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port + 4, 4); -#else - if (pid->driver_data != 0x0924 && port != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], port, 4); -#endif /* OPTi93X */ - if (irq != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq, 1); - if (dma1 != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1, 1); -#if defined(CS4231) || defined(OPTi93X) - if (dma2 != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2, 1); -#else -#ifdef snd_opti9xx_fixup_dma2 - snd_opti9xx_fixup_dma2(pdev); -#endif -#endif /* CS4231 || OPTi93X */ -#ifdef OPTi93X - if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], fm_port, 4); -#else - if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], fm_port, 4); -#endif - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "AUDIO the requested resources are invalid, using auto config\n"); + err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err); - kfree(cfg); return err; } @@ -1756,15 +1722,6 @@ static int __devinit snd_card_opti9xx_pn pdev = chip->devmpu; if (pdev && mpu_port > 0) { - pnp_init_resource_table(cfg); - - if (mpu_port != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], mpu_port, 2); - if (mpu_irq != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], mpu_irq, 1); - - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "AUDIO the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "AUDIO pnp configure failure\n"); @@ -1775,7 +1732,6 @@ static int __devinit snd_card_opti9xx_pn mpu_irq = pnp_irq(pdev, 0); } } - kfree(cfg); return pid->driver_data; } #endif /* CONFIG_PNP */ diff --git a/isa/sb/es968.c b/isa/sb/es968.c --- a/isa/sb/es968.c +++ b/isa/sb/es968.c @@ -49,12 +49,6 @@ MODULE_PARM_DESC(id, "ID string for es96 MODULE_PARM_DESC(id, "ID string for es968 based soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable es968 based soundcard."); -module_param_array(port, long, NULL, 0444); -MODULE_PARM_DESC(port, "Port # for es968 driver."); -module_param_array(irq, int, NULL, 0444); -MODULE_PARM_DESC(irq, "IRQ # for es968 driver."); -module_param_array(dma8, int, NULL, 0444); -MODULE_PARM_DESC(dma8, "8-bit DMA # for es968 driver."); struct snd_card_es968 { struct pnp_dev *dev; @@ -86,40 +80,23 @@ static int __devinit snd_card_es968_pnp( const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; + acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree(cfg); + if (acard->dev == NULL) return -ENODEV; - } pdev = acard->dev; - pnp_init_resource_table(cfg); - - /* override resources */ - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - if (dma8[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n"); - kfree(cfg); return err; } port[dev] = pnp_port_start(pdev, 0); dma8[dev] = pnp_dma(pdev, 1); irq[dev] = pnp_irq(pdev, 0); - kfree(cfg); return 0; } diff --git a/isa/sb/sb16.c b/isa/sb/sb16.c --- a/isa/sb/sb16.c +++ b/isa/sb/sb16.c @@ -257,44 +257,21 @@ static int __devinit snd_card_sb16_pnp(i const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) { - kfree(cfg); + if (acard->dev == NULL) return -ENODEV; - } + #ifdef SNDRV_SBAWE_EMU8000 acard->devwt = pnp_request_card_device(card, id->devs[1].id, acard->dev); #endif /* Audio initialization */ pdev = acard->dev; - pnp_init_resource_table(cfg); - - /* override resources */ - - if (port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], port[dev], 16); - if (mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], mpu_port[dev], 2); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[2], fm_port[dev], 4); - if (dma8[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1); - if (dma16[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma16[dev], 1); - if (irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n"); - kfree(cfg); return err; } port[dev] = pnp_port_start(pdev, 0); @@ -311,17 +288,6 @@ static int __devinit snd_card_sb16_pnp(i /* WaveTable initialization */ pdev = acard->devwt; if (pdev != NULL) { - pnp_init_resource_table(cfg); - - /* override resources */ - - if (awe_port[dev] != SNDRV_AUTO_PORT) { - pnp_resource_change(&cfg->port_resource[0], awe_port[dev], 4); - pnp_resource_change(&cfg->port_resource[1], awe_port[dev] + 0x400, 4); - pnp_resource_change(&cfg->port_resource[2], awe_port[dev] + 0x800, 4); - } - if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) - snd_printk(KERN_ERR PFX "WaveTable the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { goto __wt_error; @@ -339,7 +305,6 @@ __wt_error: awe_port[dev] = -1; } #endif - kfree(cfg); return 0; } diff --git a/isa/wavefront/wavefront.c b/isa/wavefront/wavefront.c --- a/isa/wavefront/wavefront.c +++ b/isa/wavefront/wavefront.c @@ -104,21 +104,15 @@ snd_wavefront_pnp (int dev, snd_wavefron const struct pnp_card_device_id *id) { struct pnp_dev *pdev; - struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); int err; - if (!cfg) - return -ENOMEM; - /* Check for each logical device. */ /* CS4232 chip (aka "windows sound system") is logical device 0 */ acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->wss == NULL) { - kfree(cfg); + if (acard->wss == NULL) return -EBUSY; - } /* there is a game port at logical device 1, but we ignore it completely */ @@ -133,25 +127,19 @@ snd_wavefront_pnp (int dev, snd_wavefron if (use_cs4232_midi[dev]) { acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL); - if (acard->mpu == NULL) { - kfree(cfg); + if (acard->mpu == NULL) return -EBUSY; - } } /* The ICS2115 synth is logical device 4 */ acard->synth = pnp_request_card_device(card, id->devs[3].id, NULL); - if (acard->synth == NULL) { - kfree(cfg); + if (acard->synth == NULL) return -EBUSY; - } /* PCM/FM initialization */ pdev = acard->wss; - - pnp_init_resource_table(cfg); /* An interesting note from the Tropez+ FAQ: @@ -165,23 +153,9 @@ snd_wavefront_pnp (int dev, snd_wavefron */ - if (cs4232_pcm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], cs4232_pcm_port[dev], 4); - if (fm_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4); - if (dma1[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1); - if (dma2[dev] != SNDRV_AUTO_DMA) - pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1); - if (cs4232_pcm_irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->irq_resource[0], cs4232_pcm_irq[dev], 1); - - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "PnP WSS the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "PnP WSS pnp configure failure\n"); - kfree(cfg); return err; } @@ -195,22 +169,9 @@ snd_wavefront_pnp (int dev, snd_wavefron pdev = acard->synth; - pnp_init_resource_table(cfg); - - if (ics2115_port[dev] != SNDRV_AUTO_PORT) { - pnp_resource_change(&cfg->port_resource[0], ics2115_port[dev], 16); - } - - if (ics2115_port[dev] != SNDRV_AUTO_IRQ) { - pnp_resource_change(&cfg->irq_resource[0], ics2115_irq[dev], 1); - } - - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "PnP ICS2115 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "PnP ICS2115 pnp configure failure\n"); - kfree(cfg); return err; } @@ -226,15 +187,6 @@ snd_wavefront_pnp (int dev, snd_wavefron pdev = acard->mpu; - pnp_init_resource_table(cfg); - - if (cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) - pnp_resource_change(&cfg->port_resource[0], cs4232_mpu_port[dev], 2); - if (cs4232_mpu_irq[dev] != SNDRV_AUTO_IRQ) - pnp_resource_change(&cfg->port_resource[0], cs4232_mpu_irq[dev], 1); - - if (pnp_manual_config_dev(pdev, cfg, 0) < 0) - snd_printk(KERN_ERR "PnP MPU401 the requested resources are invalid, using auto config\n"); err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "PnP MPU401 pnp configure failure\n"); @@ -258,7 +210,6 @@ snd_wavefront_pnp (int dev, snd_wavefron ics2115_port[dev], ics2115_irq[dev]); - kfree(cfg); return 0; }

6 19