git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
pnp
/
pnpbios
/
rsparser.c
diff --git
a/drivers/pnp/pnpbios/rsparser.c
b/drivers/pnp/pnpbios/rsparser.c
index
f990065
..
79bce7b
100644
(file)
--- a/
drivers/pnp/pnpbios/rsparser.c
+++ b/
drivers/pnp/pnpbios/rsparser.c
@@
-8,6
+8,12
@@
#include <linux/pnp.h>
#include <linux/pnpbios.h>
#include <linux/pnp.h>
#include <linux/pnpbios.h>
+#ifdef CONFIG_PCI
+#include <linux/pci.h>
+#else
+inline void pcibios_penalize_isa_irq(int irq) {}
+#endif /* CONFIG_PCI */
+
#include "pnpbios.h"
/* standard resource tags */
#include "pnpbios.h"
/* standard resource tags */
@@
-58,6
+64,7
@@
pnpbios_parse_allocated_irqresource(struct pnp_resource_table * res, int irq)
}
res->irq_resource[i].start =
res->irq_resource[i].end = (unsigned long) irq;
}
res->irq_resource[i].start =
res->irq_resource[i].end = (unsigned long) irq;
+ pcibios_penalize_isa_irq(irq);
}
}
}
}
@@
-65,7
+72,9
@@
static void
pnpbios_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma)
{
int i = 0;
pnpbios_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma)
{
int i = 0;
- while (!(res->dma_resource[i].flags & IORESOURCE_UNSET) && i < PNP_MAX_DMA) i++;
+ while (i < PNP_MAX_DMA &&
+ !(res->dma_resource[i].flags & IORESOURCE_UNSET))
+ i++;
if (i < PNP_MAX_DMA) {
res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag
if (dma == -1) {
if (i < PNP_MAX_DMA) {
res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag
if (dma == -1) {
@@
-285,10
+294,13
@@
static void
pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
{
struct pnp_irq * irq;
pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
{
struct pnp_irq * irq;
+ unsigned long bits;
+
irq = pnpbios_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;
irq = pnpbios_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;
- irq->map = (p[2] << 8) | p[1];
+ bits = (p[2] << 8) | p[1];
+ bitmap_copy(irq->map, &bits, 16);
if (size > 2)
irq->flags = p[3];
else
if (size > 2)
irq->flags = p[3];
else
@@
-346,12
+358,12
@@
pnpbios_parse_resource_option_data(unsigned char * p, unsigned char * end, struc
{
unsigned int len, tag;
int priority = 0;
{
unsigned int len, tag;
int priority = 0;
- struct pnp_option *option;
+ struct pnp_option *option
, *option_independent
;
if (!p)
return NULL;
if (!p)
return NULL;
- option = pnp_register_independent_option(dev);
+ option
_independent = option
= pnp_register_independent_option(dev);
if (!option)
return NULL;
if (!option)
return NULL;
@@
-428,9
+440,14
@@
pnpbios_parse_resource_option_data(unsigned char * p, unsigned char * end, struc
case SMALL_TAG_ENDDEP:
if (len != 0)
goto len_err;
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:
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;
p = p + 2;
return (unsigned char *)p;
break;