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

Commit e4fd1f4a authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

PCIE: cleanup on probe error 



If pcie_portdrv_probe() fails but it had already called
pci_enable_device(), then call pci_disable_device() when
returning error.

Is there some reason that this isn't being done?
or was it just missed?

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 60854838

drivers/pci/pcie/portdrv_pci.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -56,8 +56,10 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev, 
		"%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", 

		"%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", 

		__FUNCTION__, dev->device, dev->vendor);

		__FUNCTION__, dev->device, dev->vendor);

	}

	}

	if (pcie_port_device_register(dev)) 

	if (pcie_port_device_register(dev)) {

		pci_disable_device(dev);

		return -ENOMEM;

		return -ENOMEM;

	}





	return 0;

	return 0;

}

}