Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62af9905 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] opl3sa2 - Fix conflict of driver name on sysfs 



Modules: OPL3SA2 driver

Fix the conflict of driver name 'opl3sa2' on sysfs with OSS driver.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2f25b7fe

sound/isa/opl3sa2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -781,7 +781,7 @@ static int snd_opl3sa2_pnp_resume(struct pnp_dev *pdev) 
#endif

#endif





static struct pnp_driver opl3sa2_pnp_driver = {

static struct pnp_driver opl3sa2_pnp_driver = {

	.name = "opl3sa2-pnpbios",

	.name = "snd-opl3sa2-pnpbios",

	.id_table = snd_opl3sa2_pnpbiosids,

	.id_table = snd_opl3sa2_pnpbiosids,

	.probe = snd_opl3sa2_pnp_detect,

	.probe = snd_opl3sa2_pnp_detect,

	.remove = __devexit_p(snd_opl3sa2_pnp_remove),

	.remove = __devexit_p(snd_opl3sa2_pnp_remove),
@@ -848,7 +848,7 @@ static int snd_opl3sa2_pnp_cresume(struct pnp_card_link *pcard) 




static struct pnp_card_driver opl3sa2_pnpc_driver = {

static struct pnp_card_driver opl3sa2_pnpc_driver = {

	.flags = PNP_DRIVER_RES_DISABLE,

	.flags = PNP_DRIVER_RES_DISABLE,

	.name = "opl3sa2",

	.name = "snd-opl3sa2-cpnp",

	.id_table = snd_opl3sa2_pnpids,

	.id_table = snd_opl3sa2_pnpids,

	.probe = snd_opl3sa2_pnp_cdetect,

	.probe = snd_opl3sa2_pnp_cdetect,

	.remove = __devexit_p(snd_opl3sa2_pnp_cremove),

	.remove = __devexit_p(snd_opl3sa2_pnp_cremove),