PNP: remove extra 0x100 bit from option priority

[linux-2.6-omap-h63xx.git] / drivers / pnp / pnpbios / rsparser.c

diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 26fb04cc12bbab31d938d8cd67642b2e6269c97a..db23ba78d39c13afaa59dc9d3caa1d57bf271a4f 100644 (file)
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -315,7 +315,7 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
                                        struct pnp_dev *dev)
 {
        unsigned int len, tag;
-       int priority = 0;
+       int priority;
        struct pnp_option *option, *option_independent;
 
        if (!p)
@@ -389,9 +389,9 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
                case SMALL_TAG_STARTDEP:
                        if (len > 1)
                                goto len_err;
-                       priority = 0x100 | PNP_RES_PRIORITY_ACCEPTABLE;
+                       priority = PNP_RES_PRIORITY_ACCEPTABLE;
                        if (len > 0)
-                               priority = 0x100 | p[1];
+                               priority = p[1];
                        option = pnp_register_dependent_option(dev, priority);
                        if (!option)
                                return NULL;