Changeset 598 for GPL/trunk/alsa-kernel/isa/sb/emu8000.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/sb/emu8000.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/isa/sb/emu8000.c

@@ -378 +378 @@
 size_dram(struct snd_emu8000 *emu)
 {
-        int i, size;
+        int i, size, detected_size;
 
         if (emu->dram_checked)
@@ -384 +384 @@
 
         size = 0;
+        detected_size = 0;
 
         /* write out a magic number */
@@ -415 +416 @@
                 EMU8000_SMLD_READ(emu); /* discard stale data  */
                 if (EMU8000_SMLD_READ(emu) != UNIQUE_ID2)
-                        break; /* we must have wrapped around */
+                        break; /* no memory at this address */
+
+                detected_size = size;
 
                 snd_emu8000_read_wait(emu);
@@ -443 +446 @@
 
         snd_printdd("EMU8000 [0x%lx]: %d Kb on-board memory detected\n",
-                    emu->port1, size/1024);
-
-        emu->mem_size = size;
+                    emu->port1, detected_size/1024);
+
+        emu->mem_size = detected_size;
         emu->dram_checked = 1;
 }