summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-01-28 14:13:13 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-01-28 14:13:13 (GMT)
commitce96bc86bf2ee12e8a3bf461ca8027557c1ef42f (patch)
tree7bc59ed51a9517ec39fb6e63f9a92c435f0e5e99 /drivers
parent05ba712d7eb156009753e18e5116cabd869cc6e2 (diff)
downloadlinux-fsl-qoriq-ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f.tar.xz
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')
-rw-r--r--drivers/net/qlge/qlge_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4adca94..5be3ae2 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);