Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 792
b: refs/heads/master
c: 0dec63b
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed May 1, 2005
1 parent 03436a2 commit 1289670
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 390725c36d220f5ca0c13b8927ac9c758ae1e4ad
refs/heads/master: 0dec63bab860cc60cc444faa0ac459f1b53545ff
4 changes: 2 additions & 2 deletions trunk/drivers/pnp/pnpacpi/rsparser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1289670

Please sign in to comment.