pnpbios parser bugfix
PATCH 1/1 pnpbios parser bugfix
hi,
this patch fix a pnpbios problem with independant resource(http://bugzilla.kernel.org/show_bug.cgi?id=3295) :
the old code assume that they are given at the beggining (before any SMALL_TAG_STARTDEP entry), but in some case there are found after SMALL_TAG_ENDDEP entry.
tag : 6 SMALL_TAG_STARTDEP
tag : 8 SMALL_TAG_PORT
tag : 6 SMALL_TAG_STARTDEP
tag : 8 SMALL_TAG_PORT
tag : 7 SMALL_TAG_ENDDEP
tag : 4 SMALL_TAG_IRQ <-- independant resource
tag : f SMALL_TAG_END
Matthieu
drivers/pnp/pnpbios/rsparser.c +7 -2
@@ -346,12 +346,12 @@ {unsigned int len, tag;int priority =0 ; -struct pnp_option *option; +struct pnp_option *option, *option_independent;if (!p)return NULL ; - option =pnp_register_independent_option (dev); + option_independent = option =pnp_register_independent_option (dev);if (!option)return NULL ;
@@ -428,9 +428,14 @@case SMALL_TAG_ENDDEP :if (len !=0 ) goto len_err; +if (option_independent == option) +printk (KERN_WARNING "PnPBIOS: Missing SMALL_TAG_STARTDEP tag\n" ); + option = option_independent;break ;case SMALL_TAG_END : +if (option_independent != option) +printk (KERN_WARNING "PnPBIOS: Missing SMALL_TAG_ENDDEP tag\n" ); p = p +2 ;return (unsigned char *)p;break ;