From cc4a72ef0db2898bd70b765468cf280014e27823 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 1 May 2005 08:59:29 -0700
Subject: [PATCH] --- yaml --- r: 790 b: refs/heads/master c:
 6e3e98d1dcf944b999757b769d910f2b506ca5b9 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/pnp/pnpbios/rsparser.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1e278fb9a95..1a89071fcd6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 408b664a7d394a5e4315fbd14aca49b042cb2b08
+refs/heads/master: 6e3e98d1dcf944b999757b769d910f2b506ca5b9
diff --git a/trunk/drivers/pnp/pnpbios/rsparser.c b/trunk/drivers/pnp/pnpbios/rsparser.c
index 618ac15a9e90..79bce7b75740 100644
--- a/trunk/drivers/pnp/pnpbios/rsparser.c
+++ b/trunk/drivers/pnp/pnpbios/rsparser.c
@@ -72,7 +72,9 @@ static void
 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) {