diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 08:28:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 08:28:46 -0800 |
| commit | 5ad587283cc15f71bb0e9cb9e0933dd8ebd66e1c (patch) | |
| tree | 743564a6e48fa6bc3667ca01d9d12452ebbcffcf /drivers/infiniband/hw/nes/nes.c | |
| parent | f511d7edf53bd49c16131fce28b87428c16239ad (diff) | |
| parent | 030f1b2f5d880c1ad3d7e0b71fc383f00f38f8f7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
MAINTAINERS: neteffect update
RDMA/nes: Fix interrupt moderation low threshold
RDMA/nes: Fix CRC endianness for RDMA connection establishment on big-endian
RDMA/nes: Fix use-after-free in mini_cm_dec_refcnt_listen()
RDMA/nes: Fix use-after-free in nes_create_cq()
RDMA/nes: Fix a check-after-use in nes_probe()
RDMA/nes: Fix a memory leak in schedule_nes_timer()
RDMA/nes: Fix off-by-one
RDMA/nes: Resurrect error path dead code
RDMA/cxgb3: Fix shift calc in build_phys_page_list() for 1-entry page lists
Diffstat (limited to 'drivers/infiniband/hw/nes/nes.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 7f8853b44ee..b2112f5a422 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -567,12 +567,12 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i /* Init the adapter */ nesdev->nesadapter = nes_init_adapter(nesdev, hw_rev); - nesdev->nesadapter->et_rx_coalesce_usecs_irq = interrupt_mod_interval; if (!nesdev->nesadapter) { printk(KERN_ERR PFX "Unable to initialize adapter.\n"); ret = -ENOMEM; goto bail5; } + nesdev->nesadapter->et_rx_coalesce_usecs_irq = interrupt_mod_interval; /* nesdev->base_doorbell_index = nesdev->nesadapter->pd_config_base[PCI_FUNC(nesdev->pcidev->devfn)]; */ |