PNP: remove extra 0x100 bit from option priority

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

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 3f75fdb..90718be 100644 (file)
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -582,7 +582,7 @@ isapnp_parse_name(char *name, unsigned int name_max, unsigned short *size)
 static int __init isapnp_create_device(struct pnp_card *card,
                                       unsigned short size)
 {
-       int number = 0, skip = 0, priority = 0, compat = 0;
+       int number = 0, skip = 0, priority, compat = 0;
        unsigned char type, tmp[17];
        struct pnp_option *option;
        struct pnp_dev *dev;
@@ -621,7 +621,6 @@ static int __init isapnp_create_device(struct pnp_card *card,
                        } else {
                                skip = 1;
                        }
-                       priority = 0;
                        compat = 0;
                        break;
                case _STAG_COMPATDEVID:
@@ -650,10 +649,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
                case _STAG_STARTDEP:
                        if (size > 1)
                                goto __skip;
-                       priority = 0x100 | PNP_RES_PRIORITY_ACCEPTABLE;
+                       priority = PNP_RES_PRIORITY_ACCEPTABLE;
                        if (size > 0) {
                                isapnp_peek(tmp, size);
-                               priority = 0x100 | tmp[0];
+                               priority = tmp[0];
                                size = 0;
                        }
                        option = pnp_register_dependent_option(dev, priority);
@@ -663,7 +662,6 @@ static int __init isapnp_create_device(struct pnp_card *card,
                case _STAG_ENDDEP:
                        if (size != 0)
                                goto __skip;
-                       priority = 0;
                        dev_dbg(&dev->dev, "end dependent options\n");
                        break;
                case _STAG_IOPORT: