1 files changed, 14 insertions, 10 deletions

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 55e9315d4ccd..3be8f97c8bc0 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1162,13 +1162,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;
 }
@@ -1181,13 +1183,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;
 }