Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1:/tmp/cvs-serv10312/isa
Modified Files:
als100.c azt2320.c cmi8330.c dt019x.c es18xx.c opl3sa2.c
sscape.c
Log Message:
- added snd_card_set_dev() macro.
- sysfsfied more pci, isapnp and usb drivers.
Index: als100.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- als100.c 30 Oct 2003 14:21:07 -0000 1.22
+++ als100.c 21 Jan 2004 18:32:46 -0000 1.23
@@ -228,6 +228,7 @@
snd_card_free(card);
return error;
}
+ snd_card_set_dev(card, &pcard->card->dev);
if ((error = snd_sbdsp_create(card, port[dev],
irq[dev],
Index: azt2320.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- azt2320.c 30 Oct 2003 14:21:08 -0000 1.22
+++ azt2320.c 21 Jan 2004 18:32:46 -0000 1.23
@@ -255,6 +255,7 @@
snd_card_free(card);
return error;
}
+ snd_card_set_dev(card, &pcard->card->dev);
if ((error = snd_card_azt2320_enable_wss(port[dev]))) {
snd_card_free(card);
Index: cmi8330.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cmi8330.c 14 Oct 2003 13:08:14 -0000 1.24
+++ cmi8330.c 21 Jan 2004 18:32:46 -0000 1.25
@@ -481,10 +481,13 @@
acard->card = card;
#ifdef CONFIG_PNP
- if (isapnp[dev] && (err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
- snd_printk("PnP detection failed\n");
- snd_card_free(card);
- return err;
+ if (isapnp[dev]) {
+ if ((err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
+ snd_printk("PnP detection failed\n");
+ snd_card_free(card);
+ return err;
+ }
+ snd_card_set_dev(card, &pcard->card->dev);
}
#endif
Index: dt019x.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dt019x.c 30 Oct 2003 14:21:08 -0000 1.13
+++ dt019x.c 21 Jan 2004 18:32:46 -0000 1.14
@@ -210,6 +210,7 @@
return -ENOMEM;
acard = (struct snd_card_dt019x *)card->private_data;
+ snd_card_set_dev(card, &pcard->card->dev);
if ((error = snd_card_dt019x_pnp(dev, acard, pcard, pid))) {
snd_card_free(card);
return error;
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- es18xx.c 13 Jan 2004 17:11:26 -0000 1.38
+++ es18xx.c 21 Jan 2004 18:32:46 -0000 1.39
@@ -2058,9 +2058,12 @@
return -ENOMEM;
acard = (struct snd_audiodrive *)card->private_data;
#ifdef CONFIG_PNP
- if (isapnp[dev] && (err = snd_audiodrive_pnp(dev, acard, pcard, pid)) < 0) {
- snd_card_free(card);
- return err;
+ if (isapnp[dev]) {
+ if ((err = snd_audiodrive_pnp(dev, acard, pcard, pid)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ snd_card_set_dev(card, &pcard->card->dev);
}
#endif
Index: opl3sa2.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- opl3sa2.c 13 Jan 2004 17:11:26 -0000 1.31
+++ opl3sa2.c 21 Jan 2004 18:32:46 -0000 1.32
@@ -759,8 +759,11 @@
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
goto __error;
#ifdef CONFIG_PNP
- if (isapnp[dev] && (err = snd_opl3sa2_pnp(dev, chip, pcard, pid)) < 0)
- goto __error;
+ if (isapnp[dev]) {
+ if ((err = snd_opl3sa2_pnp(dev, chip, pcard, pid)) < 0)
+ goto __error;
+ snd_card_set_dev(card, &pcard->card->dev);
+ }
#endif
chip->ymode = opl3sa3_ymode[dev] & 0x03 ; /* initialise this card from
supplied (or default) parameter*/
chip->card = card;
Index: sscape.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sscape.c 13 Jan 2004 17:11:26 -0000 1.8
+++ sscape.c 21 Jan 2004 18:32:46 -0000 1.9
@@ -1409,6 +1409,7 @@
ret = create_sscape(this, &card);
if (ret < 0)
return ret;
+ snd_card_set_dev(card, &pcard->card->dev);
pnp_set_card_drvdata(pcard, card);
++sscape_cards;
++idx;
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
