diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-28 09:13:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-28 09:13:13 -0500 |
commit | ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f (patch) | |
tree | 7bc59ed51a9517ec39fb6e63f9a92c435f0e5e99 /drivers/net/qlge | |
parent | 05ba712d7eb156009753e18e5116cabd869cc6e2 (diff) |
net: merge fixup for qlge_main
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 4adca94a521f..5be3ae2f5a16 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -4499,7 +4499,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
4499 | if (qdev->mpi_coredump == NULL) { | 4499 | if (qdev->mpi_coredump == NULL) { |
4500 | dev_err(&pdev->dev, "Coredump alloc failed.\n"); | 4500 | dev_err(&pdev->dev, "Coredump alloc failed.\n"); |
4501 | err = -ENOMEM; | 4501 | err = -ENOMEM; |
4502 | goto err_out; | 4502 | goto err_out2; |
4503 | } | 4503 | } |
4504 | if (qlge_force_coredump) | 4504 | if (qlge_force_coredump) |
4505 | set_bit(QL_FRC_COREDUMP, &qdev->flags); | 4505 | set_bit(QL_FRC_COREDUMP, &qdev->flags); |