aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpbios
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-06-27 18:57:15 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 17:27:07 -0400
commite2a1a6f1cfaf6ee770a8700e5df8a3708dae503b (patch)
treebab0c1b3dbc593fc3d89f3897c3cf949244c3105 /drivers/pnp/pnpbios
parentd5ebde6ef5c2d51828f975a81d7d0e58bccfd833 (diff)
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>
Diffstat (limited to 'drivers/pnp/pnpbios')
-rw-r--r--drivers/pnp/pnpbios/rsparser.c6
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,
315 struct pnp_dev *dev) 315 struct pnp_dev *dev)
316{ 316{
317 unsigned int len, tag; 317 unsigned int len, tag;
318 int priority = 0; 318 int priority;
319 struct pnp_option *option, *option_independent; 319 struct pnp_option *option, *option_independent;
320 320
321 if (!p) 321 if (!p)
@@ -389,9 +389,9 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
389 case SMALL_TAG_STARTDEP: 389 case SMALL_TAG_STARTDEP:
390 if (len > 1) 390 if (len > 1)
391 goto len_err; 391 goto len_err;
392 priority = 0x100 | PNP_RES_PRIORITY_ACCEPTABLE; 392 priority = PNP_RES_PRIORITY_ACCEPTABLE;
393 if (len > 0) 393 if (len > 0)
394 priority = 0x100 | p[1]; 394 priority = p[1];
395 option = pnp_register_dependent_option(dev, priority); 395 option = pnp_register_dependent_option(dev, priority);
396 if (!option) 396 if (!option)
397 return NULL; 397 return NULL;