diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-06-27 18:57:15 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2008-07-16 17:27:07 -0400 |
commit | e2a1a6f1cfaf6ee770a8700e5df8a3708dae503b (patch) | |
tree | bab0c1b3dbc593fc3d89f3897c3cf949244c3105 /drivers/pnp/pnpacpi | |
parent | d5ebde6ef5c2d51828f975a81d7d0e58bccfd833 (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/pnpacpi')
-rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 851c773feae1..e114b3d2b933 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
@@ -579,7 +579,7 @@ struct acpipnp_parse_option_s { | |||
579 | static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res, | 579 | static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res, |
580 | void *data) | 580 | void *data) |
581 | { | 581 | { |
582 | int priority = 0; | 582 | int priority; |
583 | struct acpipnp_parse_option_s *parse_data = data; | 583 | struct acpipnp_parse_option_s *parse_data = data; |
584 | struct pnp_dev *dev = parse_data->dev; | 584 | struct pnp_dev *dev = parse_data->dev; |
585 | struct pnp_option *option = parse_data->option; | 585 | struct pnp_option *option = parse_data->option; |