From 8d14e78c1172218f71f44f8c213e56f9222e35d0 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Tue, 8 Jun 2010 00:20:10 +0200
Subject: [PATCH] --- yaml --- r: 206826 b: refs/heads/master c:
 56d04cb189f955e5167c27944d61aa57ad69b598 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/firewire/core-cdev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4fe9102c1939..4bc0b5658aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae86e81e434072be28ff4e9c1be3cc2562be8749
+refs/heads/master: 56d04cb189f955e5167c27944d61aa57ad69b598
diff --git a/trunk/drivers/firewire/core-cdev.c b/trunk/drivers/firewire/core-cdev.c
index 32a33da64991..ca72cdaa68c9 100644
--- a/trunk/drivers/firewire/core-cdev.c
+++ b/trunk/drivers/firewire/core-cdev.c
@@ -847,7 +847,7 @@ static void iso_callback(struct fw_iso_context *context, u32 cycle,
 	struct client *client = data;
 	struct iso_interrupt_event *e;
 
-	e = kzalloc(sizeof(*e) + header_length, GFP_ATOMIC);
+	e = kmalloc(sizeof(*e) + header_length, GFP_ATOMIC);
 	if (e == NULL)
 		return;