From cbcbab3b1de89de59231e41c5017963c85d159b6 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Mon, 4 May 2009 17:22:43 -0700
Subject: [PATCH] --- yaml --- r: 145375 b: refs/heads/master c:
 fe92c9e481a147a9e1e14f55870f32903b967777 h: refs/heads/master i:   145373:
 054619ce27b7da7b9b827236635e999719fc9441   145371:
 f7049fc3a8b7f3987e4304b8beec33c560ab5bbc   145367:
 2ad2b38e2d67bc3a07c806179b0a4871c7f7d1cf   145359:
 44770dced937d3b2cb54f7bd09ecc0e50d398f02   145343:
 96813971286eeb989f2c76f2ba0e2b8fea5c9464 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/usb/gadget/atmel_usba_udc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 265544c90a46..316ed049301e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f42706c90470851fd2e97eda7a4109e8949bde8a
+refs/heads/master: fe92c9e481a147a9e1e14f55870f32903b967777
diff --git a/trunk/drivers/usb/gadget/atmel_usba_udc.c b/trunk/drivers/usb/gadget/atmel_usba_udc.c
index 5644897c1c5d..05c913cc3658 100644
--- a/trunk/drivers/usb/gadget/atmel_usba_udc.c
+++ b/trunk/drivers/usb/gadget/atmel_usba_udc.c
@@ -1941,7 +1941,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
 	usba_writel(udc, CTRL, USBA_DISABLE_MASK);
 	clk_disable(pclk);
 
-	usba_ep = kmalloc(sizeof(struct usba_ep) * pdata->num_ep,
+	usba_ep = kzalloc(sizeof(struct usba_ep) * pdata->num_ep,
 			  GFP_KERNEL);
 	if (!usba_ep)
 		goto err_alloc_ep;