]> git.hungrycats.org Git - linux/commitdiff
[PATCH] 3c509 oops fix
authorAndrew Morton <akpm@osdl.org>
Mon, 19 Apr 2004 07:57:04 +0000 (03:57 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Mon, 19 Apr 2004 07:57:04 +0000 (03:57 -0400)
If __ISAPNP__ and CONFIG_X86_PC9800 are not set, we forget to link the device
into the global chain and el3_init_module dereferences NULL.

drivers/net/3c509.c

index a5d572a209664287aee0164f8f1fb63dfc6df402..60b186182f94901e6e4781daf076b07200086118 100644 (file)
@@ -595,10 +595,8 @@ no_pnp:
 #endif
 
        el3_cards++;
-#if !defined(__ISAPNP__) || defined(CONFIG_X86_PC9800)
        lp->next_dev = el3_root_dev;
        el3_root_dev = dev;
-#endif
        return 0;
 
 out1: