diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /drivers/uwb/allocator.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
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 436e4f7110cb..e45e673b8770 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 | |||
| 326 | int bit_index; | 326 | int bit_index; |
| 327 | 327 | ||
| 328 | ai = kzalloc(sizeof(struct uwb_rsv_alloc_info), GFP_KERNEL); | 328 | ai = kzalloc(sizeof(struct uwb_rsv_alloc_info), GFP_KERNEL); |
| 329 | 329 | if (!ai) | |
| 330 | return UWB_RSV_ALLOC_NOT_FOUND; | ||
| 330 | ai->min_mas = rsv->min_mas; | 331 | ai->min_mas = rsv->min_mas; |
| 331 | ai->max_mas = rsv->max_mas; | 332 | ai->max_mas = rsv->max_mas; |
| 332 | ai->max_interval = rsv->max_interval; | 333 | ai->max_interval = rsv->max_interval; |