lkml.org 
[lkml]   [2003]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2.6.0-test4][Bug 976] modprobe pcnet32 (no card) then ns83820 (card present) causes oops
Date
Hi.

The problem in pcnet32 is, that it doesn't unregister pci, if there's no
hardware.

This patch solves the problem.
As Barry K. Nathan reported, it also works if you have the card.

Feedback welcome.


Domen


--- linux-2.6.0-test4-clean/drivers/net/pcnet32.c 2003-08-24 11:42:49.000000000 +0200
+++ linux-2.6.0-test4/drivers/net/pcnet32.c 2003-08-24 11:42:38.000000000 +0200
@@ -1726,6 +1726,7 @@
/* An additional parameter that may be passed in... */
static int debug = -1;
static int tx_start_pt = -1;
+static int pcnet32_have_pci;

static int __init pcnet32_init_module(void)
{
@@ -1738,7 +1739,8 @@
tx_start = tx_start_pt;

/* find the PCI devices */
- pci_module_init(&pcnet32_driver);
+ if (!pci_module_init(&pcnet32_driver))
+ pcnet32_have_pci = 1;

/* should we find any remaining VLbus devices ? */
if (pcnet32vlb)
@@ -1747,7 +1749,7 @@
if (cards_found)
printk(KERN_INFO PFX "%d cards_found.\n", cards_found);

- return cards_found ? 0 : -ENODEV;
+ return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV;
}

static void __exit pcnet32_cleanup_module(void)
@@ -1765,6 +1767,9 @@
free_netdev(pcnet32_dev);
pcnet32_dev = next_dev;
}
+
+ if (pcnet32_have_pci)
+ pci_unregister_driver(&pcnet32_driver);
}

module_init(pcnet32_init_module);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.039 / U:8.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site