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>
This commit is contained in:
Stephen Rothwell 2010-01-28 06:13:13 -08:00 committed by David S. Miller
parent 05ba712d7e
commit ce96bc86bf

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