From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Jan 2010 14:13:13 +0000 (-0800)
Subject: net: merge fixup for qlge_main
X-Git-Tag: v3.12-rc1~11246^2~495
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f;p=kernel%2Fkernel-generic.git

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>
---

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);