Commit a65da0c3 authored Nov 21, 2014 by Maciej W. Rozycki Committed by David S. Miller Nov 21, 2014

defxx: Fix DEFPA enable error propagation

Correctly propagate the error code from `pci_enable_device' if non zero.
Currently a failure of this function is correctly recognized and device
initialization abandoned, however a successful completion code returned.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 37dd9255

drivers/net/fddi/defxx.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -542,11 +542,14 @@ static int dfx_register(struct device *bdev)
		}

		/* Enable PCI device. */
		if (dfx_bus_pci && pci_enable_device(to_pci_dev(bdev))) {
		printk(KERN_ERR "%s: Cannot enable PCI device, aborting\n",
		if (dfx_bus_pci) {
		err = pci_enable_device(to_pci_dev(bdev));
		if (err) {
		pr_err("%s: Cannot enable PCI device, aborting\n",
		print_name);
		goto err_out;
		}
		}

		SET_NETDEV_DEV(dev, bdev);