3 files changed, 19 insertions, 15 deletions

diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c
index 57d9f154c88b..38931f2f6967 100644
--- a/sound/oss/dmasound/dmasound_atari.c
+++ b/sound/oss/dmasound/dmasound_atari.c
@@ -847,23 +847,23 @@ static int __init AtaIrqInit(void)
            of events. So all we need to keep the music playing is
            to provide the sound hardware with new data upon
            an interrupt from timer A. */
-        mfp.tim_ct_a = 0;       /* ++roman: Stop timer before programming! */
-        mfp.tim_dt_a = 1;       /* Cause interrupt after first event. */
-        mfp.tim_ct_a = 8;       /* Turn on event counting. */
+        st_mfp.tim_ct_a = 0;    /* ++roman: Stop timer before programming! */
+        st_mfp.tim_dt_a = 1;    /* Cause interrupt after first event. */
+        st_mfp.tim_ct_a = 8;    /* Turn on event counting. */
         /* Register interrupt handler. */
         if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound",
                         AtaInterrupt))
                 return 0;
-        mfp.int_en_a |= 0x20;   /* Turn interrupt on. */
-        mfp.int_mk_a |= 0x20;
+        st_mfp.int_en_a |= 0x20;        /* Turn interrupt on. */
+        st_mfp.int_mk_a |= 0x20;
         return 1;
 }
 
 #ifdef MODULE
 static void AtaIrqCleanUp(void)
 {
-        mfp.tim_ct_a = 0;       /* stop timer */
-        mfp.int_en_a &= ~0x20;  /* turn interrupt off */
+        st_mfp.tim_ct_a = 0;            /* stop timer */
+        st_mfp.int_en_a &= ~0x20;       /* turn interrupt off */
         free_irq(IRQ_MFP_TIMA, AtaInterrupt);
 }
 #endif /* MODULE */
@@ -1599,7 +1599,7 @@ static int __init dmasound_atari_init(void)
                 is_falcon = 0;
             } else
                 return -ENODEV;
-            if ((mfp.int_en_a & mfp.int_mk_a & 0x20) == 0)
+            if ((st_mfp.int_en_a & st_mfp.int_mk_a & 0x20) == 0)
                 return dmasound_init();
             else {
                 printk("DMA sound driver: Timer A interrupt already in use\n");
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 482fb0304ca9..4ae51dcb81af 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev,
 {
         struct snd_hwdep *hwdep = dev_get_drvdata(dev);
         struct hda_codec *codec = hwdep->private_data;
-        char *p;
-        struct hda_verb verb, *v;
+        struct hda_verb *v;
+        int nid, verb, param;
 
-        verb.nid = simple_strtoul(buf, &p, 0);
-        verb.verb = simple_strtoul(p, &p, 0);
-        verb.param = simple_strtoul(p, &p, 0);
-        if (!verb.nid || !verb.verb || !verb.param)
+        if (sscanf(buf, "%i %i %i", &nid, &verb, &param) != 3)
+                return -EINVAL;
+        if (!nid || !verb)
                 return -EINVAL;
         v = snd_array_new(&codec->init_verbs);
         if (!v)
                 return -ENOMEM;
-        *v = verb;
+        v->nid = nid;
+        v->verb = verb;
+        v->param = param;
         return count;
 }
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ed8fcbd60003..a680be0d4534 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -7017,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec)
                 case 0x106b3e00: /* iMac 24 Aluminium */
                         board_config = ALC885_IMAC24;
                         break;
+                case 0x106b00a0: /* MacBookPro3,1 - Another revision */
                 case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */
                 case 0x106b00a4: /* MacbookPro4,1 */
                 case 0x106b2c00: /* Macbook Pro rev3 */
@@ -8469,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
                 ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
                 ALC888_ACER_ASPIRE_4930G),
+        SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",
+                ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
         SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
         SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),