ALSA: msnd: Avoid duplicated driver name
commit 092f9cd16aac7d054af1755c945f37c1b33399e6 upstream. msnd_pinnacle.c is used for both snd-msnd-pinnacle and snd-msnd-classic drivers, and both should have different driver names. Using the same driver name results in the sysfs warning for duplicated entries like kobject: 'msnd-pinnacle.7' (cec33408): kobject_release, parent (null) (delayed) kobject: 'msnd-pinnacle' (cecd4980): kobject_release, parent cf3ad9b0 (delayed) ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:486 sysfs_warn_dup+0x7d/0xa0() sysfs: cannot create duplicate filename '/bus/isa/drivers/msnd-pinnacle' ...... Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
86e6de789c
commit
737d967e6b
|
@ -73,9 +73,11 @@
|
|||
#ifdef MSND_CLASSIC
|
||||
# include "msnd_classic.h"
|
||||
# define LOGNAME "msnd_classic"
|
||||
# define DEV_NAME "msnd-classic"
|
||||
#else
|
||||
# include "msnd_pinnacle.h"
|
||||
# define LOGNAME "snd_msnd_pinnacle"
|
||||
# define DEV_NAME "msnd-pinnacle"
|
||||
#endif
|
||||
|
||||
static void set_default_audio_parameters(struct snd_msnd *chip)
|
||||
|
@ -1068,8 +1070,6 @@ static int snd_msnd_isa_remove(struct device *pdev, unsigned int dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#define DEV_NAME "msnd-pinnacle"
|
||||
|
||||
static struct isa_driver snd_msnd_driver = {
|
||||
.match = snd_msnd_isa_match,
|
||||
.probe = snd_msnd_isa_probe,
|
||||
|
|
Loading…
Reference in New Issue