lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

Browse Source
This commit is contained in:
Linus Torvalds
2005-11-10 13:27:06 -08:00
parent 6b482c6779 94382f3562
commit 78b9c0f91c
20 changed files with 466 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/infiniband/core/verbs.c
View File

@ -325,16 +325,8 @@ EXPORT_SYMBOL(ib_destroy_cq);
int ib_resize_cq(struct ib_cq *cq,
int cqe)
{
int ret;
if (!cq->device->resize_cq)
return -ENOSYS;
ret = cq->device->resize_cq(cq, &cqe);
if (!ret)
cq->cqe = cqe;
return ret;
return cq->device->resize_cq ?
cq->device->resize_cq(cq, cqe) : -ENOSYS;
}
EXPORT_SYMBOL(ib_resize_cq);