All of lore.kernel.org
 help / color / mirror / Atom feed
* [KJ] [PATCH] drivers/char/watchdog/* : pci_request_regions
@ 2005-02-14 15:01 Christophe Lucas
  2005-02-14 15:10 ` Matthew Wilcox
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: Christophe Lucas @ 2005-02-14 15:01 UTC (permalink / raw)
  To: kernel-janitors

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

Hi,

description:
If PCI request regions fails, then someone else is using the
hardware we wish to use. For that one case, calling
pci_disable_device() is rather rude.
See : http://www.ussg.iu.edu/hypermail/linux/kernel/0502.1/1061.html

Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>


[-- Attachment #2: pci_disable-linux-2.6.11-rc4_drivers_char_watchdog.patch --]
[-- Type: text/plain, Size: 1009 bytes --]

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc4-vanilla/drivers/char/watchdog/pcwd_pci.c linux-2.6.11-rc4/drivers/char/watchdog/pcwd_pci.c
--- linux-2.6.11-rc4-vanilla/drivers/char/watchdog/pcwd_pci.c	2004-12-24 22:33:59.000000000 +0100
+++ linux-2.6.11-rc4/drivers/char/watchdog/pcwd_pci.c	2005-02-14 09:45:07.000000000 +0100
@@ -506,6 +506,7 @@ static int __devinit pcipcwd_card_init(s
 	int got_fw_rev, fw_rev_major, fw_rev_minor;
 	char fw_ver_str[20];
 	char option_switches;
+	int pci_dev_busy = 0 ;
 
 	cards_found++;
 	if (cards_found == 1)
@@ -534,6 +535,7 @@ static int __devinit pcipcwd_card_init(s
 		printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
 			(int) pcipcwd_private.io_addr);
 		ret = -EIO;
+		pci_dev_busy = 1 ;
 		goto err_out_disable_device;
 	}
 
@@ -621,7 +623,8 @@ err_out_unregister_reboot:
 err_out_release_region:
 	pci_release_regions(pdev);
 err_out_disable_device:
-	pci_disable_device(pdev);
+	if(!pci_dev_busy)
+		pci_disable_device(pdev);
 	return ret;
 }
 

[-- Attachment #3: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2005-02-17 19:35 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-14 15:01 [KJ] [PATCH] drivers/char/watchdog/* : pci_request_regions Christophe Lucas
2005-02-14 15:10 ` Matthew Wilcox
2005-02-14 15:12 ` Matthew Wilcox
2005-02-14 15:12   ` Matthew Wilcox
2005-02-17 18:49   ` Jeff Garzik
2005-02-17 18:49     ` Jeff Garzik
2005-02-17 19:04     ` Matthew Wilcox
2005-02-17 19:04       ` Matthew Wilcox
2005-02-17 19:22       ` Jeff Garzik
2005-02-17 19:22         ` Jeff Garzik
2005-02-14 15:50 ` Christophe Lucas
2005-02-14 19:10 ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.