aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/isapnp
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/isapnp')
-rw-r--r--drivers/pnp/isapnp/core.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 3f75fdbe609..90718be6646 100644
--- 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)
582static int __init isapnp_create_device(struct pnp_card *card, 582static int __init isapnp_create_device(struct pnp_card *card,
583 unsigned short size) 583 unsigned short size)
584{ 584{
585 int number = 0, skip = 0, priority = 0, compat = 0; 585 int number = 0, skip = 0, priority, compat = 0;
586 unsigned char type, tmp[17]; 586 unsigned char type, tmp[17];
587 struct pnp_option *option; 587 struct pnp_option *option;
588 struct pnp_dev *dev; 588 struct pnp_dev *dev;
@@ -621,7 +621,6 @@ static int __init isapnp_create_device(struct pnp_card *card,
621 } else { 621 } else {
622 skip = 1; 622 skip = 1;
623 } 623 }
624 priority = 0;
625 compat = 0; 624 compat = 0;
626 break; 625 break;
627 case _STAG_COMPATDEVID: 626 case _STAG_COMPATDEVID:
@@ -650,10 +649,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
650 case _STAG_STARTDEP: 649 case _STAG_STARTDEP:
651 if (size > 1) 650 if (size > 1)
652 goto __skip; 651 goto __skip;
653 priority = 0x100 | PNP_RES_PRIORITY_ACCEPTABLE; 652 priority = PNP_RES_PRIORITY_ACCEPTABLE;
654 if (size > 0) { 653 if (size > 0) {
655 isapnp_peek(tmp, size); 654 isapnp_peek(tmp, size);
656 priority = 0x100 | tmp[0]; 655 priority = tmp[0];
657 size = 0; 656 size = 0;
658 } 657 }
659 option = pnp_register_dependent_option(dev, priority); 658 option = pnp_register_dependent_option(dev, priority);
@@ -663,7 +662,6 @@ static int __init isapnp_create_device(struct pnp_card *card,
663 case _STAG_ENDDEP: 662 case _STAG_ENDDEP:
664 if (size != 0) 663 if (size != 0)
665 goto __skip; 664 goto __skip;
666 priority = 0;
667 dev_dbg(&dev->dev, "end dependent options\n"); 665 dev_dbg(&dev->dev, "end dependent options\n");
668 break; 666 break;
669 case _STAG_IOPORT: 667 case _STAG_IOPORT: