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:
  mlx4_core: Fix infinite loop on device initialization
This commit is contained in:
Linus Torvalds 2007-10-13 18:16:49 -07:00
commit d773b33972
1 changed files with 1 additions and 1 deletions

View File

@ -884,7 +884,7 @@ static int __devinit mlx4_init_one(struct pci_dev *pdev,
++mlx4_version_printed;
}
return mlx4_init_one(pdev, id);
return __mlx4_init_one(pdev, id);
}
static void mlx4_remove_one(struct pci_dev *pdev)