diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-12-22 07:57:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-22 07:57:54 +0100 |
| commit | cb3b04debbb70de7b266f75777ac2b9ff567c460 (patch) | |
| tree | cebcd5b7d4213d246ea7b667408428799e69fcba /sound/isa/sb | |
| parent | ALSA: pcm - Add missing inclusion of linux/vmalloc.h (diff) | |
| parent | ALSA: sbawe: fix memory detection (diff) | |
| download | linux-dev-cb3b04debbb70de7b266f75777ac2b9ff567c460.tar.xz linux-dev-cb3b04debbb70de7b266f75777ac2b9ff567c460.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/isa/sb')
| -rw-r--r-- | sound/isa/sb/emu8000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 96678d5d3834..751762f1c59a 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c @@ -393,8 +393,6 @@ size_dram(struct snd_emu8000 *emu) while (size < EMU8000_MAX_DRAM) { - size += 512 * 1024; /* increment 512kbytes */ - /* Write a unique data on the test address. * if the address is out of range, the data is written on * 0x200000(=EMU8000_DRAM_OFFSET). Then the id word is @@ -414,7 +412,9 @@ size_dram(struct snd_emu8000 *emu) /*snd_emu8000_read_wait(emu);*/ 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 */ + + size += 512 * 1024; /* increment 512kbytes */ snd_emu8000_read_wait(emu); |