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: (365 commits)
  ALSA: hda - Disable sticky PCM stream assignment for AD codecs
  ALSA: usb - Creative USB X-Fi volume knob support
  ALSA: ca0106: Use card specific dac id for mute controls.
  ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
  ALSA: ca0106: Create a nice spot for mapping channels to dacs.
  ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
  ALSA: ca0106: Pull out dac powering routine into separate function.
  ALSA: ca0106 - add Sound Blaster 5.1vx info.
  ASoC: tlv320dac33: Use usleep_range for delays
  ALSA: usb-audio: add Novation Launchpad support
  ALSA: hda - Add workarounds for CT-IBG controllers
  ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
  ASoC: tpa6130a2: Error handling for broken chip
  ASoC: max98088: Staticise m98088_eq_band
  ASoC: soc-core: Fix codec->name memory leak
  ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
  ALSA: hda - Add some workarounds for Creative IBG
  ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
  ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
  ALSA: hda - Add alc_init_jacks() call to other codecs
  ...

5 files changed, 39 insertions, 25 deletions

diff --git a/sound/core/init.c b/sound/core/init.c
index f7c3df8b521b..57b792e2439a 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -604,11 +604,16 @@ card_id_store_attr(struct device *dev, struct device_attribute *attr,
                 return -EEXIST;
         }
         for (idx = 0; idx < snd_ecards_limit; idx++) {
-                if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1))
-                        goto __exist;
+                if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1)) {
+                        if (card == snd_cards[idx])
+                                goto __ok;
+                        else
+                                goto __exist;
+                }
         }
         strcpy(card->id, buf1);
         snd_info_card_id_change(card);
+__ok:
         mutex_unlock(&snd_card_mutex);
 
         return count;
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index f50ebf20df96..822dd56993ca 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -77,7 +77,7 @@ static int snd_mixer_oss_release(struct inode *inode, struct file *file)
         struct snd_mixer_oss_file *fmixer;
 
         if (file->private_data) {
-                fmixer = (struct snd_mixer_oss_file *) file->private_data;
+                fmixer = file->private_data;
                 module_put(fmixer->card->module);
                 snd_card_file_remove(fmixer->card, file);
                 kfree(fmixer);
@@ -368,7 +368,7 @@ static int snd_mixer_oss_ioctl1(struct snd_mixer_oss_file *fmixer, unsigned int
 
 static long snd_mixer_oss_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        return snd_mixer_oss_ioctl1((struct snd_mixer_oss_file *) file->private_data, cmd, arg);
+        return snd_mixer_oss_ioctl1(file->private_data, cmd, arg);
 }
 
 int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned long arg)
@@ -582,7 +582,7 @@ static int snd_mixer_oss_get_volume1(struct snd_mixer_oss_file *fmixer,
                                      struct snd_mixer_oss_slot *pslot,
                                      int *left, int *right)
 {
-        struct slot *slot = (struct slot *)pslot->private_data;
+        struct slot *slot = pslot->private_data;
         
         *left = *right = 100;
         if (slot->present & SNDRV_MIXER_OSS_PRESENT_PVOLUME) {
@@ -618,8 +618,10 @@ static void snd_mixer_oss_put_volume1_vol(struct snd_mixer_oss_file *fmixer,
         if (numid == ID_UNKNOWN)
                 return;
         down_read(&card->controls_rwsem);
-        if ((kctl = snd_ctl_find_numid(card, numid)) == NULL)
+        if ((kctl = snd_ctl_find_numid(card, numid)) == NULL) {
+                up_read(&card->controls_rwsem);
                 return;
+        }
         uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
         uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
         if (uinfo == NULL || uctl == NULL)
@@ -658,7 +660,7 @@ static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,
                 return;
         down_read(&card->controls_rwsem);
         if ((kctl = snd_ctl_find_numid(card, numid)) == NULL) {
-                up_read(&fmixer->card->controls_rwsem);
+                up_read(&card->controls_rwsem);
                 return;
         }
         uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
@@ -691,7 +693,7 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer,
                                      struct snd_mixer_oss_slot *pslot,
                                      int left, int right)
 {
-        struct slot *slot = (struct slot *)pslot->private_data;
+        struct slot *slot = pslot->private_data;
         
         if (slot->present & SNDRV_MIXER_OSS_PRESENT_PVOLUME) {
                 snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PVOLUME], left, right);
@@ -740,7 +742,7 @@ static int snd_mixer_oss_get_recsrc1_sw(struct snd_mixer_oss_file *fmixer,
                                         struct snd_mixer_oss_slot *pslot,
                                         int *active)
 {
-        struct slot *slot = (struct slot *)pslot->private_data;
+        struct slot *slot = pslot->private_data;
         int left, right;
         
         left = right = 1;
@@ -753,7 +755,7 @@ static int snd_mixer_oss_get_recsrc1_route(struct snd_mixer_oss_file *fmixer,
                                            struct snd_mixer_oss_slot *pslot,
                                            int *active)
 {
-        struct slot *slot = (struct slot *)pslot->private_data;
+        struct slot *slot = pslot->private_data;
         int left, right;
         
         left = right = 1;
@@ -766,7 +768,7 @@ static int snd_mixer_oss_put_recsrc1_sw(struct snd_mixer_oss_file *fmixer,
                                         struct snd_mixer_oss_slot *pslot,
                                         int active)
 {
-        struct slot *slot = (struct slot *)pslot->private_data;
+        struct slot *slot = pslot->private_data;
         
         snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CSWITCH], active, active, 0);
         return 0;
@@ -776,7 +778,7 @@ static int snd_mixer_oss_put_recsrc1_route(struct snd_mixer_oss_file *fmixer,
                                            struct snd_mixer_oss_slot *pslot,
                                            int active)
 {
-        struct slot *slot = (struct slot *)pslot->private_data;
+        struct slot *slot = pslot->private_data;
         
         snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CROUTE], active, active, 1);
         return 0;
@@ -797,7 +799,7 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
         uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
         if (uinfo == NULL || uctl == NULL) {
                 err = -ENOMEM;
-                goto __unlock;
+                goto __free_only;
         }
         down_read(&card->controls_rwsem);
         kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);
@@ -813,7 +815,7 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
                 if (!(mixer->mask_recsrc & (1 << idx)))
                         continue;
                 pslot = &mixer->slots[idx];
-                slot = (struct slot *)pslot->private_data;
+                slot = pslot->private_data;
                 if (slot->signature != SNDRV_MIXER_OSS_SIGNATURE)
                         continue;
                 if (!(slot->present & SNDRV_MIXER_OSS_PRESENT_CAPTURE))
@@ -826,6 +828,7 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
         err = 0;
       __unlock:
         up_read(&card->controls_rwsem);
+      __free_only:
         kfree(uctl);
         kfree(uinfo);
         return err;
@@ -847,7 +850,7 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
         uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
         if (uinfo == NULL || uctl == NULL) {
                 err = -ENOMEM;
-                goto __unlock;
+                goto __free_only;
         }
         down_read(&card->controls_rwsem);
         kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);
@@ -861,7 +864,7 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
                 if (!(mixer->mask_recsrc & (1 << idx)))
                         continue;
                 pslot = &mixer->slots[idx];
-                slot = (struct slot *)pslot->private_data;
+                slot = pslot->private_data;
                 if (slot->signature != SNDRV_MIXER_OSS_SIGNATURE)
                         continue;
                 if (!(slot->present & SNDRV_MIXER_OSS_PRESENT_CAPTURE))
@@ -880,6 +883,7 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
         err = 0;
       __unlock:
         up_read(&card->controls_rwsem);
+      __free_only:
         kfree(uctl);
         kfree(uinfo);
         return err;
@@ -925,7 +929,7 @@ static int snd_mixer_oss_build_test(struct snd_mixer_oss *mixer, struct slot *sl
 
 static void snd_mixer_oss_slot_free(struct snd_mixer_oss_slot *chn)
 {
-        struct slot *p = (struct slot *)chn->private_data;
+        struct slot *p = chn->private_data;
         if (p) {
                 if (p->allocated && p->assigned) {
                         kfree(p->assigned->name);
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index ac242a377aea..6b4b1287b314 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -364,8 +364,7 @@ static void snd_pcm_stream_proc_info_read(struct snd_info_entry *entry,
 static void snd_pcm_substream_proc_info_read(struct snd_info_entry *entry,
                                              struct snd_info_buffer *buffer)
 {
-        snd_pcm_proc_info_read((struct snd_pcm_substream *)entry->private_data,
-                               buffer);
+        snd_pcm_proc_info_read(entry->private_data, buffer);
 }
 
 static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index e23e0e7ab26f..a1707cca9c66 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -334,11 +334,15 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
                 /* delta = "expected next hw_ptr" for in_interrupt != 0 */
                 delta = runtime->hw_ptr_interrupt + runtime->period_size;
                 if (delta > new_hw_ptr) {
-                        hw_base += runtime->buffer_size;
-                        if (hw_base >= runtime->boundary)
-                                hw_base = 0;
-                        new_hw_ptr = hw_base + pos;
-                        goto __delta;
+                        /* check for double acknowledged interrupts */
+                        hdelta = jiffies - runtime->hw_ptr_jiffies;
+                        if (hdelta > runtime->hw_ptr_buffer_jiffies/2) {
+                                hw_base += runtime->buffer_size;
+                                if (hw_base >= runtime->boundary)
+                                        hw_base = 0;
+                                new_hw_ptr = hw_base + pos;
+                                goto __delta;
+                        }
                 }
         }
         /* new_hw_ptr might be lower than old_hw_ptr in case when */
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index d4eb2ef80784..8bc7cb3db330 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -142,7 +142,7 @@ int snd_pcm_info_user(struct snd_pcm_substream *substream,
 
 #ifdef RULES_DEBUG
 #define HW_PARAM(v) [SNDRV_PCM_HW_PARAM_##v] = #v
-char *snd_pcm_hw_param_names[] = {
+static const char * const snd_pcm_hw_param_names[] = {
         HW_PARAM(ACCESS),
         HW_PARAM(FORMAT),
         HW_PARAM(SUBFORMAT),
@@ -864,6 +864,8 @@ static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state)
         struct snd_pcm_runtime *runtime = substream->runtime;
         snd_pcm_trigger_tstamp(substream);
         runtime->hw_ptr_jiffies = jiffies;
+        runtime->hw_ptr_buffer_jiffies = (runtime->buffer_size * HZ) / 
+                                                            runtime->rate;
         runtime->status->state = state;
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
             runtime->silence_size > 0)