Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ALSA: msnd: Avoid duplicated driver name

Browse source 
commit 092f9cd16a 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:
Takashi Iwai 2013-11-12 08:06:20 +01:00 committed by Greg Kroah-Hartman
parent 1b443352fe
commit eaea722ea8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/isa/msnd/msnd_pinnacle.c
View file

@ -73,9 +73,11 @@
#ifdef MSND_CLASSIC #ifdef MSND_CLASSIC
# include "msnd_classic.h" # include "msnd_classic.h"
# define LOGNAME "msnd_classic" # define LOGNAME "msnd_classic"
# define DEV_NAME "msnd-classic"
#else #else
# include "msnd_pinnacle.h" # include "msnd_pinnacle.h"
# define LOGNAME "snd_msnd_pinnacle" # define LOGNAME "snd_msnd_pinnacle"
# define DEV_NAME "msnd-pinnacle"
#endif #endif
static void __devinit set_default_audio_parameters(struct snd_msnd *chip) static void __devinit set_default_audio_parameters(struct snd_msnd *chip)
@ -1068,8 +1070,6 @@ static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev)
return 0; return 0;
} }
#define DEV_NAME "msnd-pinnacle"
static struct isa_driver snd_msnd_driver = { static struct isa_driver snd_msnd_driver = {
.match = snd_msnd_isa_match, .match = snd_msnd_isa_match,
.probe = snd_msnd_isa_probe, .probe = snd_msnd_isa_probe,