diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 01:13:28 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 01:13:28 (GMT) |
| commit | 00dad7fa99701f5ca83b9f598d1c36c9523bbbf7 (patch) | |
| tree | 6cd0f9a4b63ed0fe25c1cfd48978209e0819e86b /drivers/uwb/allocator.c | |
| parent | edaa4d668babd65e98e1452043996bbefc0285b0 (diff) | |
| parent | 868719752d60fb04a3714d77fdeb780b4d585faf (diff) | |
| download | linux-fsl-qoriq-00dad7fa99701f5ca83b9f598d1c36c9523bbbf7.tar.xz | |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits)
Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"
USB: ohci-jz4740: Fix spelling in MODULE_ALIAS
UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails
usb: core: fix information leak to userland
usb: misc: iowarrior: fix information leak to userland
usb: misc: sisusbvga: fix information leak to userland
usb: subtle increased memory usage in u_serial
USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
USB: xhci: Use GFP_ATOMIC under spin_lock
usb: gadget: goku_udc: add registered flag bit, fixing build
USB: ehci/mxc: compile fix
USB: Fix FSL USB driver on non Open Firmware systems
USB: the development of the usb tree is now in git
usb: musb: fail unaligned DMA transfers on v1.8 and above
USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
usb.h: fix ioctl kernel-doc info
usb: musb: gadget: kill duplicate code in musb_gadget_queue()
usb: musb: Fix handling of spurious SESSREQ
usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time
USB: musb: blackfin: push clkin value to platform resources
...
Diffstat (limited to 'drivers/uwb/allocator.c')
| -rw-r--r-- | drivers/uwb/allocator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/uwb/allocator.c b/drivers/uwb/allocator.c index 436e4f7..e45e673 100644 --- a/drivers/uwb/allocator.c +++ b/drivers/uwb/allocator.c @@ -326,7 +326,8 @@ int uwb_rsv_find_best_allocation(struct uwb_rsv *rsv, struct uwb_mas_bm *availab int bit_index; ai = kzalloc(sizeof(struct uwb_rsv_alloc_info), GFP_KERNEL); - + if (!ai) + return UWB_RSV_ALLOC_NOT_FOUND; ai->min_mas = rsv->min_mas; ai->max_mas = rsv->max_mas; ai->max_interval = rsv->max_interval; |