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

Commit c8920f0c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

[PATCH] cpcihp_zt5550: add pci_enable_device() 



Add pci_{enable,disable}_device() calls.  Without pci_enable_device(),
dev->irq is garbage, and cpcihp_zt5550 relies on it.

Compiled but untested, since I don't have the hardware.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarScott Murray <scottm@somanetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

 drivers/pci/hotplug/cpcihp_zt5550.c |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)
parent d3535fbb

drivers/pci/hotplug/cpcihp_zt5550.c

+21 −4
Original line number Diff line number Diff line
@@ -78,11 +78,20 @@ static void __iomem *csr_int_mask; 


static int zt5550_hc_config(struct pci_dev *pdev)

{

	int ret;



	/* Since we know that no boards exist with two HC chips, treat it as an error */

	if(hc_dev) {

		err("too many host controller devices?");

		return -EBUSY;

	}



	ret = pci_enable_device(pdev);

	if(ret) {

		err("cannot enable %s\n", pci_name(pdev));

		return ret;

	}



	hc_dev = pdev;

	dbg("hc_dev = %p", hc_dev);

	dbg("pci resource start %lx", pci_resource_start(hc_dev, 1));
@@ -91,7 +100,8 @@ static int zt5550_hc_config(struct pci_dev *pdev) 
	if(!request_mem_region(pci_resource_start(hc_dev, 1),

				pci_resource_len(hc_dev, 1), MY_NAME)) {

		err("cannot reserve MMIO region");

		return -ENOMEM;

		ret = -ENOMEM;

		goto exit_disable_device;

	}



	hc_registers =
@@ -99,9 +109,8 @@ static int zt5550_hc_config(struct pci_dev *pdev) 
	if(!hc_registers) {

		err("cannot remap MMIO region %lx @ %lx",

		    pci_resource_len(hc_dev, 1), pci_resource_start(hc_dev, 1));

		release_mem_region(pci_resource_start(hc_dev, 1),

				   pci_resource_len(hc_dev, 1));

		return -ENODEV;

		ret = -ENODEV;

		goto exit_release_region;

	}



	csr_hc_index = hc_registers + CSR_HCINDEX;
@@ -124,6 +133,13 @@ static int zt5550_hc_config(struct pci_dev *pdev) 
	writeb((u8) ALL_DIRECT_INTS_MASK, csr_int_mask);

	dbg("disabled timer0, timer1 and ENUM interrupts");

	return 0;



exit_release_region:

	release_mem_region(pci_resource_start(hc_dev, 1),

			   pci_resource_len(hc_dev, 1));

exit_disable_device:

	pci_disable_device(hc_dev);

	return ret;

}



static int zt5550_hc_cleanup(void)
@@ -134,6 +150,7 @@ static int zt5550_hc_cleanup(void) 
	iounmap(hc_registers);

	release_mem_region(pci_resource_start(hc_dev, 1),

			   pci_resource_len(hc_dev, 1));

	pci_disable_device(hc_dev);

	return 0;

}