From 903fa621d7911d2ccad2cbd0a52d92751125aa35 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 12 Dec 2008 22:08:50 -0800
Subject: [PATCH] --- yaml --- r: 122629 b: refs/heads/master c:
 0c53d8c84047d86169bd4147bb8f5adf2772d2bb h: refs/heads/master i:   122627:
 cd757fdcc5ab8ce5b1b58a6b41bf9d83c9b20519 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/sfc/falcon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9674e36d39c4..623ca55b0962 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa402b2ea9cacd1ec94fa77e3efb506a5d034da6
+refs/heads/master: 0c53d8c84047d86169bd4147bb8f5adf2772d2bb
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index df844defc0a9..6884dc8c1f82 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/drivers/net/sfc/falcon.c
@@ -2690,7 +2690,7 @@ static int falcon_spi_device_init(struct efx_nic *efx,
 	struct efx_spi_device *spi_device;
 
 	if (device_type != 0) {
-		spi_device = kmalloc(sizeof(*spi_device), GFP_KERNEL);
+		spi_device = kzalloc(sizeof(*spi_device), GFP_KERNEL);
 		if (!spi_device)
 			return -ENOMEM;
 		spi_device->device_id = device_id;