Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda: make a STAC_DELL_EQ option
  ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy models
  ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)
  ALSA: remove direct access of dev->bus_id in sound/isa/*
  sound: struct device - replace bus_id with dev_name(), dev_set_name()
  ALSA: Fix PIT lockup on some chipsets when using the PC-Speaker
  ALSA: rawmidi - Add open check in rawmidi callbacks
  ALSA: hda - Add digital-mic for ALC269 auto-probe mode
  ALSA: hda - Disable broken mic auto-muting in Realtek codes

2 files changed, 4 insertions, 4 deletions

diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c
index ecdbeb6d360..7783843ca9a 100644
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
@@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
         /* get irq */
         irq = platform_get_irq(pfdev, 0);
         if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
-                        pfdev->dev.bus_id, (void *)ml403_ac97cr)) {
+                        dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
                 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
                            "unable to grab IRQ %d\n",
                            irq);
@@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
                    ml403_ac97cr->irq);
         irq = platform_get_irq(pfdev, 1);
         if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
-                        pfdev->dev.bus_id, (void *)ml403_ac97cr)) {
+                        dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
                 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
                            "unable to grab IRQ %d\n",
                            irq);
diff --git a/sound/drivers/pcsp/pcsp_input.c b/sound/drivers/pcsp/pcsp_input.c
index cd9b83e7f7d..0444cdeb4be 100644
--- a/sound/drivers/pcsp/pcsp_input.c
+++ b/sound/drivers/pcsp/pcsp_input.c
@@ -24,13 +24,13 @@ static void pcspkr_do_sound(unsigned int count)
         spin_lock_irqsave(&i8253_lock, flags);
 
         if (count) {
-                /* enable counter 2 */
-                outb_p(inb_p(0x61) | 3, 0x61);
                 /* set command for counter 2, 2 byte write */
                 outb_p(0xB6, 0x43);
                 /* select desired HZ */
                 outb_p(count & 0xff, 0x42);
                 outb((count >> 8) & 0xff, 0x42);
+                /* enable counter 2 */
+                outb_p(inb_p(0x61) | 3, 0x61);
         } else {
                 /* disable counter 2 */
                 outb(inb_p(0x61) & 0xFC, 0x61);