diff options
Diffstat (limited to 'drivers/usb/atm')
-rw-r--r-- | drivers/usb/atm/cxacru.c | 2 | ||||
-rw-r--r-- | drivers/usb/atm/usbatm.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 8e184e2641cb..79861ee12a29 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
@@ -715,13 +715,11 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, | |||
715 | usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD), | 715 | usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD), |
716 | instance->rcv_buf, PAGE_SIZE, | 716 | instance->rcv_buf, PAGE_SIZE, |
717 | cxacru_blocking_completion, &instance->rcv_done, 1); | 717 | cxacru_blocking_completion, &instance->rcv_done, 1); |
718 | instance->rcv_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
719 | 718 | ||
720 | usb_fill_int_urb(instance->snd_urb, | 719 | usb_fill_int_urb(instance->snd_urb, |
721 | usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD), | 720 | usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD), |
722 | instance->snd_buf, PAGE_SIZE, | 721 | instance->snd_buf, PAGE_SIZE, |
723 | cxacru_blocking_completion, &instance->snd_done, 4); | 722 | cxacru_blocking_completion, &instance->snd_done, 4); |
724 | instance->snd_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
725 | 723 | ||
726 | init_MUTEX(&instance->cm_serialize); | 724 | init_MUTEX(&instance->cm_serialize); |
727 | 725 | ||
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index bb1db1959854..c466739428b2 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
@@ -960,7 +960,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, | |||
960 | intf->altsetting->desc.bInterfaceNumber); | 960 | intf->altsetting->desc.bInterfaceNumber); |
961 | 961 | ||
962 | /* instance init */ | 962 | /* instance init */ |
963 | instance = kcalloc(1, sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL); | 963 | instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL); |
964 | if (!instance) { | 964 | if (!instance) { |
965 | dev_dbg(dev, "%s: no memory for instance data!\n", __func__); | 965 | dev_dbg(dev, "%s: no memory for instance data!\n", __func__); |
966 | return -ENOMEM; | 966 | return -ENOMEM; |