PNP: remove extra 0x100 bit from option priority

When building resource options, ISAPNP and PNPBIOS set the priority
to something like "0x100 | PNP_RES_PRIORITY_ACCEPTABLE", but we
immediately mask off the 0x100 again in pnp_build_option(), so that
bit looks superfluous.

Thanks to Rene Herman <rene.herman@gmail.com> for pointing this out.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 26fb04cc12bb..db23ba78d39c 100644
--- 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;