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

Commit 119d3e56 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

[WATCHDOG] wdt_pci - use pci_request_region 



Use pci_request_region instead of request_region for this pci_driver.

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent d7e9791b

drivers/watchdog/wdt_pci.c

+8 −7
Original line number Diff line number Diff line
@@ -647,14 +647,15 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, 
		goto out_pci;

	}



	irq = dev->irq;

	io = pci_resource_start(dev, 2);



	if (request_region(io, 16, "wdt_pci") == NULL) {

		printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", io);

	if (pci_request_region(dev, 2, "wdt_pci")) {

		printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",

			pci_resource_start(dev, 2));

		goto out_pci;

	}



	irq = dev->irq;

	io = pci_resource_start(dev, 2);



	if (request_irq(irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED,

			 "wdt_pci", &wdtpci_miscdev)) {

		printk(KERN_ERR PFX "IRQ %d is not free\n", irq);
@@ -717,7 +718,7 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, 
out_irq:

	free_irq(irq, &wdtpci_miscdev);

out_reg:

	release_region(io, 16);

	pci_release_region(dev, 2);

out_pci:

	pci_disable_device(dev);

	goto out;
@@ -733,7 +734,7 @@ static void __devexit wdtpci_remove_one(struct pci_dev *pdev) 
		misc_deregister(&temp_miscdev);

	unregister_reboot_notifier(&wdtpci_notifier);

	free_irq(irq, &wdtpci_miscdev);

	release_region(io, 16);

	pci_release_region(pdev, 2);

	pci_disable_device(pdev);

	dev_count--;

}