From 596e46423d795203c61ec94a9b757b4d6944e772 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Sun, 13 Jul 2008 13:58:12 +0200
Subject: [PATCH] --- yaml --- r: 99193 b: refs/heads/master c:
 80ca9a706b458d09b8cc8d5258bb61957f66ca5e h: refs/heads/master i:   99191:
 ac5073213110235fbb61dd4803bca70381298d91 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/pci/nm256/nm256.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4a7e6b571623..de069e2ec88f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 862c2c0a61c515f2e9f63f689215bcf99a607eaf
+refs/heads/master: 80ca9a706b458d09b8cc8d5258bb61957f66ca5e
diff --git a/trunk/sound/pci/nm256/nm256.c b/trunk/sound/pci/nm256/nm256.c
index 7efb838d18a6..06d13e717114 100644
--- a/trunk/sound/pci/nm256/nm256.c
+++ b/trunk/sound/pci/nm256/nm256.c
@@ -1302,8 +1302,8 @@ snd_nm256_mixer(struct nm256 *chip)
 		.read = snd_nm256_ac97_read,
 	};
 
-	chip->ac97_regs = kcalloc(sizeof(short),
-				  ARRAY_SIZE(nm256_ac97_init_val), GFP_KERNEL);
+	chip->ac97_regs = kcalloc(ARRAY_SIZE(nm256_ac97_init_val),
+				  sizeof(short), GFP_KERNEL);
 	if (! chip->ac97_regs)
 		return -ENOMEM;