diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/hc_crisv10.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/uhci-q.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c index 282d82efc0b0..f0ffb8907f29 100644 --- a/drivers/usb/host/hc_crisv10.c +++ b/drivers/usb/host/hc_crisv10.c | |||
@@ -2163,9 +2163,8 @@ static void etrax_usb_add_to_bulk_sb_list(struct urb *urb, int epid) | |||
2163 | 2163 | ||
2164 | maxlen = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe)); | 2164 | maxlen = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe)); |
2165 | 2165 | ||
2166 | sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, SLAB_FLAG); | 2166 | sb_desc = kmem_cache_zalloc(usb_desc_cache, SLAB_FLAG); |
2167 | assert(sb_desc != NULL); | 2167 | assert(sb_desc != NULL); |
2168 | memset(sb_desc, 0, sizeof(USB_SB_Desc_t)); | ||
2169 | 2168 | ||
2170 | 2169 | ||
2171 | if (usb_pipeout(urb->pipe)) { | 2170 | if (usb_pipeout(urb->pipe)) { |
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c index 2cbb239e63f8..68e66b33e726 100644 --- a/drivers/usb/host/uhci-q.c +++ b/drivers/usb/host/uhci-q.c | |||
@@ -624,12 +624,10 @@ static inline struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci, | |||
624 | { | 624 | { |
625 | struct urb_priv *urbp; | 625 | struct urb_priv *urbp; |
626 | 626 | ||
627 | urbp = kmem_cache_alloc(uhci_up_cachep, GFP_ATOMIC); | 627 | urbp = kmem_cache_zalloc(uhci_up_cachep, GFP_ATOMIC); |
628 | if (!urbp) | 628 | if (!urbp) |
629 | return NULL; | 629 | return NULL; |
630 | 630 | ||
631 | memset((void *)urbp, 0, sizeof(*urbp)); | ||
632 | |||
633 | urbp->urb = urb; | 631 | urbp->urb = urb; |
634 | urb->hcpriv = urbp; | 632 | urb->hcpriv = urbp; |
635 | 633 | ||