diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-28 06:13:13 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-28 06:13:13 -0800 |
commit | ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f (patch) | |
tree | 7bc59ed51a9517ec39fb6e63f9a92c435f0e5e99 /drivers/net/qlge/qlge_main.c | |
parent | 05ba712d7eb156009753e18e5116cabd869cc6e2 (diff) | |
download | kernel-common-ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f.tar.gz kernel-common-ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f.tar.bz2 kernel-common-ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f.zip |
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/qlge_main.c')
-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, if (qdev->mpi_coredump == NULL) { dev_err(&pdev->dev, "Coredump alloc failed.\n"); err = -ENOMEM; - goto err_out; + goto err_out2; } if (qlge_force_coredump) set_bit(QL_FRC_COREDUMP, &qdev->flags); |