Merge branch 'fix/misc' into topic/misc

4 files changed, 29 insertions, 16 deletions

diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 1caf5e3c1f6..e68c98ef404 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1852,12 +1852,14 @@ static unsigned int ad1981_jacks_blacklist[] = {
         0x10140523, /* Thinkpad R40 */
         0x10140534, /* Thinkpad X31 */
         0x10140537, /* Thinkpad T41p */
+        0x1014053e, /* Thinkpad R40e */
         0x10140554, /* Thinkpad T42p/R50p */
         0x10140567, /* Thinkpad T43p 2668-G7U */
         0x10140581, /* Thinkpad X41-2527 */
         0x10280160, /* Dell Dimension 2400 */
         0x104380b0, /* Asus A7V8X-MX */
         0x11790241, /* Toshiba Satellite A-15 S127 */
+        0x1179ff10, /* Toshiba P500 */
         0x144dc01a, /* Samsung NP-X20C004/SEG */
         0 /* end */
 };
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 1ded64e0564..329968edca9 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -941,13 +941,21 @@ static snd_pcm_uframes_t snd_cmipci_pcm_pointer(struct cmipci *cm, struct cmipci
                                                 struct snd_pcm_substream *substream)
 {
         size_t ptr;
-        unsigned int reg;
+        unsigned int reg, rem, tries;
+
         if (!rec->running)
                 return 0;
 #if 1 // this seems better..
         reg = rec->ch ? CM_REG_CH1_FRAME2 : CM_REG_CH0_FRAME2;
-        ptr = rec->dma_size - (snd_cmipci_read_w(cm, reg) + 1);
-        ptr >>= rec->shift;
+        for (tries = 0; tries < 3; tries++) {
+                rem = snd_cmipci_read_w(cm, reg);
+                if (rem < rec->dma_size)
+                        goto ok;
+        } 
+        printk(KERN_ERR "cmipci: invalid PCM pointer: %#x\n", rem);
+        return SNDRV_PCM_POS_XRUN;
+ok:
+        ptr = (rec->dma_size - (rem + 1)) >> rec->shift;
 #else
         reg = rec->ch ? CM_REG_CH1_FRAME1 : CM_REG_CH0_FRAME1;
         ptr = snd_cmipci_read(cm, reg) - rec->offset;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 8dab82d7d19..668a5ec0449 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2184,10 +2184,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
                         goto ctl_error;
 #endif
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
+        err = snd_card_register(card);
+        if (err < 0)
                 goto ctl_error;
-        }
         snd_printk(KERN_INFO "Card registered: %s\n", card->longname);
 
         pci_set_drvdata(pci, chip);
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 7e8e7da592a..ea4256b08a3 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1161,13 +1161,15 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private
                                 unsigned long count, unsigned long pos)
 {
         struct mixart_mgr *mgr = entry->private_data;
+        unsigned long maxsize;
 
-        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
-        if(count <= 0)
+        if (pos >= MIXART_BA0_SIZE)
                 return 0;
-        if(pos + count > MIXART_BA0_SIZE)
-                count = (long)(MIXART_BA0_SIZE - pos);
-        if(copy_to_user_fromio(buf, MIXART_MEM( mgr, pos ), count))
+        maxsize = MIXART_BA0_SIZE - pos;
+        if (count > maxsize)
+                count = maxsize;
+        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
+        if (copy_to_user_fromio(buf, MIXART_MEM(mgr, pos), count))
                 return -EFAULT;
         return count;
 }
@@ -1180,13 +1182,15 @@ static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private
                                 unsigned long count, unsigned long pos)
 {
         struct mixart_mgr *mgr = entry->private_data;
+        unsigned long maxsize;
 
-        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
-        if(count <= 0)
+        if (pos > MIXART_BA1_SIZE)
                 return 0;
-        if(pos + count > MIXART_BA1_SIZE)
-                count = (long)(MIXART_BA1_SIZE - pos);
-        if(copy_to_user_fromio(buf, MIXART_REG( mgr, pos ), count))
+        maxsize = MIXART_BA1_SIZE - pos;
+        if (count > maxsize)
+                count = maxsize;
+        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
+        if (copy_to_user_fromio(buf, MIXART_REG(mgr, pos), count))
                 return -EFAULT;
         return count;
 }