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 | |
| parent | ee7c343c0134bf126b4235e65c407711b77174da (diff) | |
| parent | db8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b (diff) | |
| download | linux-stable-cb3b04debbb70de7b266f75777ac2b9ff567c460.tar.gz linux-stable-cb3b04debbb70de7b266f75777ac2b9ff567c460.tar.bz2 linux-stable-cb3b04debbb70de7b266f75777ac2b9ff567c460.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/msnd/msnd_midi.c | 2 | ||||
| -rw-r--r-- | sound/isa/sb/emu8000.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c index cb9aa4c4edd0..4be562b2cf21 100644 --- a/sound/isa/msnd/msnd_midi.c +++ b/sound/isa/msnd/msnd_midi.c @@ -162,7 +162,7 @@ int snd_msndmidi_new(struct snd_card *card, int device) err = snd_rawmidi_new(card, "MSND-MIDI", device, 1, 1, &rmidi); if (err < 0) return err; - mpu = kcalloc(1, sizeof(*mpu), GFP_KERNEL); + mpu = kzalloc(sizeof(*mpu), GFP_KERNEL); if (mpu == NULL) { snd_device_free(card, rmidi); return -ENOMEM; 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); |