From 9132f89d86fe712a1abe3b1405613679b8bb1136 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Sun, 20 Dec 2009 20:15:19 +0100 Subject: [PATCH] --- yaml --- r: 178117 b: refs/heads/master c: db8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b h: refs/heads/master i: 178115: 1e411233254f89b497430e87aebf9356d8256aef v: v3 --- [refs] | 2 +- trunk/sound/isa/sb/emu8000.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fc6599ba7a8b..76ba6a214a91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40962d7c741de1c21b6ce8516c1d9f8836fb383e +refs/heads/master: db8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b diff --git a/trunk/sound/isa/sb/emu8000.c b/trunk/sound/isa/sb/emu8000.c index 96678d5d3834..751762f1c59a 100644 --- a/trunk/sound/isa/sb/emu8000.c +++ b/trunk/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);