From c0cdd56876a41fec2f56eac2c7c326b440255b4d Mon Sep 17 00:00:00 2001
From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Date: Fri, 10 Aug 2007 14:53:35 -0700
Subject: [PATCH] --- yaml --- r: 67849 b: refs/heads/master c:
 5280d6083a77cc06a8c8360a2c461fd12d780fb8 h: refs/heads/master i:   67847:
 048d14a1147fe208241bea639bb55ea73e0ec0d9 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/misc/ftdi-elan.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 18dc05380798..1ceb06621007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3aceb2bab988e514e65dd37f385221a095ad477
+refs/heads/master: 5280d6083a77cc06a8c8360a2c461fd12d780fb8
diff --git a/trunk/drivers/usb/misc/ftdi-elan.c b/trunk/drivers/usb/misc/ftdi-elan.c
index 538b535e955b..d3d8cd6ff103 100644
--- a/trunk/drivers/usb/misc/ftdi-elan.c
+++ b/trunk/drivers/usb/misc/ftdi-elan.c
@@ -2777,12 +2777,14 @@ static int ftdi_elan_probe(struct usb_interface *interface,
         size_t buffer_size;
         int i;
         int retval = -ENOMEM;
-        struct usb_ftdi *ftdi = kmalloc(sizeof(struct usb_ftdi), GFP_KERNEL);
-        if (ftdi == NULL) {
+        struct usb_ftdi *ftdi;
+
+	ftdi = kzalloc(sizeof(struct usb_ftdi), GFP_KERNEL);
+	if (!ftdi) {
                 printk(KERN_ERR "Out of memory\n");
                 return -ENOMEM;
         }
-        memset(ftdi, 0x00, sizeof(struct usb_ftdi));
+
         mutex_lock(&ftdi_module_lock);
         list_add_tail(&ftdi->ftdi_list, &ftdi_static_list);
         ftdi->sequence_num = ++ftdi_instances;