From 1e411233254f89b497430e87aebf9356d8256aef Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 19 Dec 2009 08:18:03 +0100
Subject: [PATCH] --- yaml --- r: 178115 b: refs/heads/master c:
 ef86f581f7e8b29cb58d7f4e892e1a91b3805124 h: refs/heads/master i:   178113:
 81258ee1c747334f8f7ba6127d9b94f14fda851b   178111:
 18fece4f5484647be515ae4f8bc111ac213bf431 v: v3

---
 [refs]                              | 2 +-
 trunk/sound/isa/msnd/msnd_midi.c    | 2 +-
 trunk/sound/pci/hda/patch_realtek.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 409cfc1fc779..559de9ecfc74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a89fefa50feda5516cd5210ad0008a44632b52
+refs/heads/master: ef86f581f7e8b29cb58d7f4e892e1a91b3805124
diff --git a/trunk/sound/isa/msnd/msnd_midi.c b/trunk/sound/isa/msnd/msnd_midi.c
index cb9aa4c4edd0..4be562b2cf21 100644
--- a/trunk/sound/isa/msnd/msnd_midi.c
+++ b/trunk/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/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
index aeed4cc5aa79..20c1828e4bac 100644
--- a/trunk/sound/pci/hda/patch_realtek.c
+++ b/trunk/sound/pci/hda/patch_realtek.c
@@ -12857,7 +12857,7 @@ static int patch_alc268(struct hda_codec *codec)
 	int board_config;
 	int i, has_beep, err;
 
-	spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);
 	if (spec == NULL)
 		return -ENOMEM;