diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /drivers/pnp/pnpacpi/rsparser.c | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pnp/pnpacpi/rsparser.c')
| -rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index c0ddb1eb8c4d..dd61e09029b1 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
| @@ -94,8 +94,8 @@ static void | |||
| 94 | pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma) | 94 | pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma) |
| 95 | { | 95 | { |
| 96 | int i = 0; | 96 | int i = 0; |
| 97 | while (!(res->dma_resource[i].flags & IORESOURCE_UNSET) && | 97 | while (i < PNP_MAX_DMA && |
| 98 | i < PNP_MAX_DMA) | 98 | !(res->dma_resource[i].flags & IORESOURCE_UNSET)) |
| 99 | i++; | 99 | i++; |
| 100 | if (i < PNP_MAX_DMA) { | 100 | if (i < PNP_MAX_DMA) { |
| 101 | res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag | 101 | res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag |