vserver 1.9.3

[linux-2.6.git] / drivers / pnp / isapnp / core.c

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 5adaac6..bf52990 100644 (file)
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -68,13 +68,8 @@ MODULE_PARM(isapnp_verbose, "i");
 MODULE_PARM_DESC(isapnp_verbose, "ISA Plug & Play verbose mode");
 MODULE_LICENSE("GPL");
 
-#ifdef CONFIG_X86_PC9800
-#define _PIDXR         0x259
-#define _PNPWRP                0xa59
-#else
 #define _PIDXR         0x279
 #define _PNPWRP                0xa79
-#endif
 
 /* short tags */
 #define _STAG_PNPVERNO         0x01
@@ -660,8 +655,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
        if ((dev = isapnp_parse_device(card, size, number++)) == NULL)
                return 1;
        option = pnp_register_independent_option(dev);
-       if (!option)
+       if (!option) {
+               kfree(dev);
                return 1;
+       }
        pnp_add_card_device(card,dev);
 
        while (1) {