diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 12:52:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 12:52:04 -0500 |
| commit | 0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e (patch) | |
| tree | 0e36f48f32c97c4ef9ed5fcd6158226345f43d2e /drivers/infiniband/hw/amso1100/c2.c | |
| parent | 4dd7406e9c7e7a5422425ef699780463490b8745 (diff) | |
| parent | 39798695b4bcc7b145f8910ca56195808d3a7637 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/mad: Fix race between cancel and receive completion
RDMA/amso1100: Fix && typo
RDMA/amso1100: Fix unitialized pseudo_netdev accessed in c2_register_device
IB/ehca: Activate scaling code by default
IB/ehca: Use named constant for max mtu
IB/ehca: Assure 4K alignment for firmware control blocks
Diffstat (limited to 'drivers/infiniband/hw/amso1100/c2.c')
| -rw-r--r-- | drivers/infiniband/hw/amso1100/c2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c index 9e7bd94b958a..27fe242ed435 100644 --- a/drivers/infiniband/hw/amso1100/c2.c +++ b/drivers/infiniband/hw/amso1100/c2.c | |||
| @@ -1155,7 +1155,8 @@ static int __devinit c2_probe(struct pci_dev *pcidev, | |||
| 1155 | goto bail10; | 1155 | goto bail10; |
| 1156 | } | 1156 | } |
| 1157 | 1157 | ||
| 1158 | c2_register_device(c2dev); | 1158 | if (c2_register_device(c2dev)) |
| 1159 | goto bail10; | ||
| 1159 | 1160 | ||
| 1160 | return 0; | 1161 | return 0; |
| 1161 | 1162 | ||