diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 17:52:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 17:52:54 +0300 |
| commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
| tree | 175b5d695437151f0f9f778ad8eb7f274468842f /sound/isa/msnd/msnd_midi.c | |
| parent | b3172f222ab5afdc91ea058bd11c42cf169728f3 (diff) | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
| download | linux-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.xz | |
Merge commit 'v2.6.33-rc2' into for-2.6.33
Diffstat (limited to 'sound/isa/msnd/msnd_midi.c')
| -rw-r--r-- | sound/isa/msnd/msnd_midi.c | 2 |
1 files changed, 1 insertions, 1 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; |