net: merge fixup for qlge_main
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jan 2010 14:13:13 +0000 (06:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 14:13:13 +0000 (06:13 -0800)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlge/qlge_main.c

index 4adca94..5be3ae2 100644 (file)
@@ -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);