From 128967070d636d5a332d11a02a360423c56d228f Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 1 May 2005 08:59:30 -0700 Subject: [PATCH] --- yaml --- r: 792 b: refs/heads/master c: 0dec63bab860cc60cc444faa0ac459f1b53545ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pnp/pnpacpi/rsparser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 41e41a41e3f3..cb3eef149a6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 390725c36d220f5ca0c13b8927ac9c758ae1e4ad +refs/heads/master: 0dec63bab860cc60cc444faa0ac459f1b53545ff diff --git a/trunk/drivers/pnp/pnpacpi/rsparser.c b/trunk/drivers/pnp/pnpacpi/rsparser.c index c0ddb1eb8c4d..dd61e09029b1 100644 --- a/trunk/drivers/pnp/pnpacpi/rsparser.c +++ b/trunk/drivers/pnp/pnpacpi/rsparser.c @@ -94,8 +94,8 @@ static void pnpacpi_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) + 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