[PATCH] [UBUNTU:sound/isa] Update opl3sa2 driver

[crimsun at fungus.sh.nu]

UpstreamStatus: Added in upstream isa/opl3sa2.c r1.5[78]

These two cvs commits in isa/opl3sa2.c fix a conflict of driver name
in sysfs with the OSS driver and an erroneous usage of the global array
(dma2 vs. xdma2). This second error was spotted by Alexey Dobriyan
<adobriyan at gmail.com>; both patches were committed by Takashi Iwai.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/isa/opl3sa2.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

31f2775f5e16534713884232addca2c1c284e829
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 47cabda..0a77b67 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -794,7 +794,7 @@ static int __devinit snd_opl3sa2_probe(i
 
 	sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
 		card->shortname, chip->port, xirq, xdma1);
-	if (dma2 >= 0)
+	if (xdma2 >= 0)
 		sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
 
 	if ((err = snd_card_set_generic_dev(card)) < 0)
@@ -844,7 +844,7 @@ static void __devexit snd_opl3sa2_pnp_re
 }
 
 static struct pnp_driver opl3sa2_pnp_driver = {
-	.name = "opl3sa2-pnpbios",
+	.name = "snd-opl3sa2-pnpbios",
 	.id_table = snd_opl3sa2_pnpbiosids,
 	.probe = snd_opl3sa2_pnp_detect,
 	.remove = __devexit_p(snd_opl3sa2_pnp_remove),
@@ -880,7 +880,7 @@ static void __devexit snd_opl3sa2_pnp_cr
 
 static struct pnp_card_driver opl3sa2_pnpc_driver = {
 	.flags = PNP_DRIVER_RES_DISABLE,
-	.name = "opl3sa2",
+	.name = "snd-opl3sa2-cpnp",
 	.id_table = snd_opl3sa2_pnpids,
 	.probe = snd_opl3sa2_pnp_cdetect,
 	.remove = __devexit_p(snd_opl3sa2_pnp_cremove),
-- 
1.1.3

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060317/7ce2c6fb/attachment.sig>