Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce96bc86 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller
Browse files

net: merge fixup for qlge_main 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05ba712d

drivers/net/qlge/qlge_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4499,7 +4499,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, 
		if (qdev->mpi_coredump == NULL) {

		if (qdev->mpi_coredump == NULL) {

			dev_err(&pdev->dev, "Coredump alloc failed.\n");

			dev_err(&pdev->dev, "Coredump alloc failed.\n");

			err = -ENOMEM;

			err = -ENOMEM;

			goto err_out;

			goto err_out2;

		}

		}

		if (qlge_force_coredump)

		if (qlge_force_coredump)

			set_bit(QL_FRC_COREDUMP, &qdev->flags);

			set_bit(QL_FRC_COREDUMP, &qdev->flags);