summaryrefslogtreecommitdiffstats
path: root/sound/isa/msnd/msnd_midi.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-22 07:57:54 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-22 07:57:54 +0100
commitcb3b04debbb70de7b266f75777ac2b9ff567c460 (patch)
treecebcd5b7d4213d246ea7b667408428799e69fcba /sound/isa/msnd/msnd_midi.c
parentee7c343c0134bf126b4235e65c407711b77174da (diff)
parentdb8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b (diff)
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/isa/msnd/msnd_midi.c')
-rw-r--r--sound/isa/msnd/msnd_midi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c
index cb9aa4c4edd..4be562b2cf2 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;