From 78738c27e550baf8196392c007606525f167d9cf Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Wed, 4 Mar 2009 12:06:15 -0800
Subject: [PATCH] --- yaml --- r: 133547 b: refs/heads/master c:
 31dbb803464d75b96212cce9052dfeaeac0819de h: refs/heads/master i:   133545:
 aeac23e716ee259dd88ffa46fa0c2ab7a190ec8d   133543:
 d62f66de8d0ce286b078310eef97e4e6726ff3d3 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/hwa-hc.c   | 3 +--
 trunk/drivers/usb/wusbcore/cbaf.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0e493a78f042..6fe8f0381994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d34d9721a559fd11ec682bd9ef17220de0162060
+refs/heads/master: 31dbb803464d75b96212cce9052dfeaeac0819de
diff --git a/trunk/drivers/usb/host/hwa-hc.c b/trunk/drivers/usb/host/hwa-hc.c
index 8582236e4cad..cbf30e515f29 100644
--- a/trunk/drivers/usb/host/hwa-hc.c
+++ b/trunk/drivers/usb/host/hwa-hc.c
@@ -464,8 +464,7 @@ static int __hwahc_dev_set_key(struct wusbhc *wusbhc, u8 port_idx, u32 tkid,
 			port_idx << 8 | iface_no,
 			keyd, keyd_len, 1000 /* FIXME: arbitrary */);
 
-	memset(keyd, 0, sizeof(*keyd));	/* clear keys etc. */
-	kfree(keyd);
+	kzfree(keyd); /* clear keys etc. */
 	return result;
 }
 
diff --git a/trunk/drivers/usb/wusbcore/cbaf.c b/trunk/drivers/usb/wusbcore/cbaf.c
index 1335cbe1191d..25eae405f622 100644
--- a/trunk/drivers/usb/wusbcore/cbaf.c
+++ b/trunk/drivers/usb/wusbcore/cbaf.c
@@ -638,8 +638,7 @@ static void cbaf_disconnect(struct usb_interface *iface)
 	usb_put_intf(iface);
 	kfree(cbaf->buffer);
 	/* paranoia: clean up crypto keys */
-	memset(cbaf, 0, sizeof(*cbaf));
-	kfree(cbaf);
+	kzfree(cbaf);
 }
 
 static struct usb_device_id cbaf_id_table[] = {