Index: sys/dev/usb/input/uhid.c =================================================================== --- sys/dev/usb/input/uhid.c +++ sys/dev/usb/input/uhid.c @@ -448,10 +448,6 @@ if (kern_data == NULL) { kern_data = malloc(len, M_USBDEV, M_WAITOK); - if (kern_data == NULL) { - err = ENOMEM; - goto done; - } free_data = 1; } err = usbd_req_get_report(sc->sc_udev, NULL, kern_data, @@ -484,10 +480,6 @@ if (kern_data == NULL) { kern_data = malloc(len, M_USBDEV, M_WAITOK); - if (kern_data == NULL) { - err = ENOMEM; - goto done; - } free_data = 1; err = copyin(user_data, kern_data, len); if (err) { Index: sys/dev/usb/net/if_kue.c =================================================================== --- sys/dev/usb/net/if_kue.c +++ sys/dev/usb/net/if_kue.c @@ -493,10 +493,6 @@ sc->sc_mcfilters = malloc(KUE_MCFILTCNT(sc) * ETHER_ADDR_LEN, M_USBDEV, M_WAITOK); - if (sc->sc_mcfilters == NULL) { - device_printf(dev, "failed allocating USB memory\n"); - goto detach; - } ue->ue_sc = sc; ue->ue_dev = dev; Index: sys/dev/usb/serial/ufoma.c =================================================================== --- sys/dev/usb/serial/ufoma.c +++ sys/dev/usb/serial/ufoma.c @@ -428,9 +428,6 @@ sc->sc_modetable = malloc(elements + 1, M_USBDEV, M_WAITOK); - if (sc->sc_modetable == NULL) { - goto detach; - } sc->sc_modetable[0] = (elements + 1); memcpy(&sc->sc_modetable[1], mad->bMode, elements); Index: sys/dev/usb/storage/ustorage_fs.c =================================================================== --- sys/dev/usb/storage/ustorage_fs.c +++ sys/dev/usb/storage/ustorage_fs.c @@ -378,10 +378,6 @@ ustorage_fs_ramdisk = malloc(USTORAGE_FS_RAM_SECT << 9, M_USB, M_ZERO | M_WAITOK); - - if (ustorage_fs_ramdisk == NULL) { - return (ENOMEM); - } } sc->sc_lun[0].memory_image = ustorage_fs_ramdisk; sc->sc_lun[0].num_sectors = USTORAGE_FS_RAM_SECT; Index: sys/dev/usb/usb_dev.c =================================================================== --- sys/dev/usb/usb_dev.c +++ sys/dev/usb/usb_dev.c @@ -377,13 +377,11 @@ struct usb_fifo *f; f = malloc(sizeof(*f), M_USBDEV, M_WAITOK | M_ZERO); - if (f != NULL) { - cv_init(&f->cv_io, "FIFO-IO"); - cv_init(&f->cv_drain, "FIFO-DRAIN"); - f->priv_mtx = mtx; - f->refcount = 1; - knlist_init_mtx(&f->selinfo.si_note, mtx); - } + cv_init(&f->cv_io, "FIFO-IO"); + cv_init(&f->cv_drain, "FIFO-DRAIN"); + f->priv_mtx = mtx; + f->refcount = 1; + knlist_init_mtx(&f->selinfo.si_note, mtx); return (f); } @@ -2312,9 +2310,6 @@ struct usb_symlink *ps; ps = malloc(sizeof(*ps), M_USBDEV, M_WAITOK); - if (ps == NULL) { - return (ps); - } /* XXX no longer needed */ strlcpy(ps->src_path, target, sizeof(ps->src_path)); ps->src_len = strlen(ps->src_path); Index: sys/dev/usb/usb_device.c =================================================================== --- sys/dev/usb/usb_device.c +++ sys/dev/usb/usb_device.c @@ -835,20 +835,12 @@ if (udev->ifaces_max != 0) { udev->ifaces = malloc(sizeof(*iface) * udev->ifaces_max, M_USB, M_WAITOK | M_ZERO); - if (udev->ifaces == NULL) { - err = USB_ERR_NOMEM; - goto done; - } } #endif #if (USB_HAVE_FIXED_ENDPOINT == 0) if (ep_max != 0) { udev->endpoints = malloc(sizeof(*ep) * ep_max, M_USB, M_WAITOK | M_ZERO); - if (udev->endpoints == NULL) { - err = USB_ERR_NOMEM; - goto done; - } } else { udev->endpoints = NULL; } @@ -1579,9 +1571,6 @@ return (NULL); } udev = malloc(sizeof(*udev), M_USB, M_WAITOK | M_ZERO); - if (udev == NULL) { - return (NULL); - } /* initialise our SX-lock */ sx_init_flags(&udev->enum_sx, "USB config SX lock", SX_DUPOK); sx_init_flags(&udev->sr_sx, "USB suspend and resume SX lock", SX_NOWITNESS); Index: sys/dev/usb/usb_generic.c =================================================================== --- sys/dev/usb/usb_generic.c +++ sys/dev/usb/usb_generic.c @@ -2288,11 +2288,6 @@ } f->fs_xfer = malloc(sizeof(f->fs_xfer[0]) * u.pinit->ep_index_max, M_USB, M_WAITOK | M_ZERO); - if (f->fs_xfer == NULL) { - usb_fifo_free_buffer(f); - error = ENOMEM; - break; - } f->fs_ep_max = u.pinit->ep_index_max; f->fs_ep_ptr = u.pinit->pEndpoints; break; Index: sys/dev/usb/usb_mbuf.c =================================================================== --- sys/dev/usb/usb_mbuf.c +++ sys/dev/usb/usb_mbuf.c @@ -77,9 +77,6 @@ free_ptr = malloc(alloc_size, type, M_WAITOK | M_ZERO); - if (free_ptr == NULL) { - goto done; - } m_ptr = free_ptr; data_ptr = (void *)(m_ptr + nblocks); Index: sys/dev/usb/usb_transfer.c =================================================================== --- sys/dev/usb/usb_transfer.c +++ sys/dev/usb/usb_transfer.c @@ -1239,13 +1239,6 @@ /* allocate zeroed memory */ buf = malloc(parm->size[0], M_USB, M_WAITOK | M_ZERO); - if (buf == NULL) { - parm->err = USB_ERR_NOMEM; - DPRINTFN(0, "cannot allocate memory block for " - "configuration (%d bytes)\n", - parm->size[0]); - goto done; - } parm->dma_tag_p = USB_ADD_BYTES(buf, parm->size[1]); parm->dma_page_ptr = USB_ADD_BYTES(buf, parm->size[3]); parm->dma_page_cache_ptr = USB_ADD_BYTES(buf, parm->size[4]);