diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2009-03-04 15:06:15 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:20:44 -0400 |
commit | 31dbb803464d75b96212cce9052dfeaeac0819de (patch) | |
tree | 608ab9e3203ecaf00a0a04ecd318d0d45bc4a50d /drivers | |
parent | d34d9721a559fd11ec682bd9ef17220de0162060 (diff) |
USB: use kzfree()
Use kzfree() instead of memset() + kfree().
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/hwa-hc.c | 3 | ||||
-rw-r--r-- | drivers/usb/wusbcore/cbaf.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c index 8582236e4cad..cbf30e515f29 100644 --- a/drivers/usb/host/hwa-hc.c +++ b/drivers/usb/host/hwa-hc.c | |||
@@ -464,8 +464,7 @@ static int __hwahc_dev_set_key(struct wusbhc *wusbhc, u8 port_idx, u32 tkid, | |||
464 | port_idx << 8 | iface_no, | 464 | port_idx << 8 | iface_no, |
465 | keyd, keyd_len, 1000 /* FIXME: arbitrary */); | 465 | keyd, keyd_len, 1000 /* FIXME: arbitrary */); |
466 | 466 | ||
467 | memset(keyd, 0, sizeof(*keyd)); /* clear keys etc. */ | 467 | kzfree(keyd); /* clear keys etc. */ |
468 | kfree(keyd); | ||
469 | return result; | 468 | return result; |
470 | } | 469 | } |
471 | 470 | ||
diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c index 1335cbe1191d..25eae405f622 100644 --- a/drivers/usb/wusbcore/cbaf.c +++ b/drivers/usb/wusbcore/cbaf.c | |||
@@ -638,8 +638,7 @@ static void cbaf_disconnect(struct usb_interface *iface) | |||
638 | usb_put_intf(iface); | 638 | usb_put_intf(iface); |
639 | kfree(cbaf->buffer); | 639 | kfree(cbaf->buffer); |
640 | /* paranoia: clean up crypto keys */ | 640 | /* paranoia: clean up crypto keys */ |
641 | memset(cbaf, 0, sizeof(*cbaf)); | 641 | kzfree(cbaf); |
642 | kfree(cbaf); | ||
643 | } | 642 | } |
644 | 643 | ||
645 | static struct usb_device_id cbaf_id_table[] = { | 644 | static struct usb_device_id cbaf_id_table[] = { |