This is a note to let you know that I've just added the patch titled
ALSA: msnd: Avoid duplicated driver name
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-msnd-avoid-duplicated-driver-name.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 092f9cd16aac7d054af1755c945f37c1b33399e6 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 12 Nov 2013 08:06:20 +0100
Subject: ALSA: msnd: Avoid duplicated driver name
From: Takashi Iwai <tiwai@xxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/isa/msnd/msnd_pinnacle.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -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 de
return 0;
}
-#define DEV_NAME "msnd-pinnacle"
-
static struct isa_driver snd_msnd_driver = {
.match = snd_msnd_isa_match,
.probe = snd_msnd_isa_probe,
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/alsa-hda-check-keep_eapd_on-before-inv_eapd.patch
queue-3.10/alsa-hda-don-t-clear-the-power-state-at-snd_hda_codec_reset.patch
queue-3.10/alsa-hda-add-support-for-cx20952.patch
queue-3.10/alsa-hda-enable-spdif-for-acer-travelmate-6293.patch
queue-3.10/alsa-hda-fix-the-headphone-jack-detection-on-sony-vaio-tx.patch
queue-3.10/alsa-hda-provide-missing-pin-configs-for-vaio-with-alc260.patch
queue-3.10/alsa-compress-fix-drain-calls-blocking-other-compress-functions.patch
queue-3.10/alsa-compress-fix-drain-calls-blocking-other-compress-functions-v6.patch
queue-3.10/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
queue-3.10/alsa-hda-add-support-of-alc255-codecs.patch
queue-3.10/alsa-6fire-fix-probe-of-multiple-cards.patch
queue-3.10/alsa-hda-make-sure-mute-leds-stay-on-during-runtime-suspend-realtek.patch
queue-3.10/alsa-msnd-avoid-duplicated-driver-name.patch
queue-3.10/alsa-hda-fix-line-out-automute-on-realtek-multifunction-jacks.patch
queue-3.10/alsa-hda-add-headset-quirk-for-dell-inspiron-3135.patch
queue-3.10/alsa-hda-don-t-turn-off-eapd-for-headphone-on-lenovo-n100.patch
queue-3.10/alsa-hda-fix-unbalanced-runtime-pm-notification-at-resume.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html