Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178929
b: refs/heads/master
c: 42d53b4
h: refs/heads/master
i:
  178927: ec8c0f9
v: v3
  • Loading branch information
Krzysztof Halasa authored and Linus Torvalds committed Jan 11, 2010
1 parent 4fecd1b commit 0d1a62b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: e992cd9b72a18122bd5c958715623057f110793f
refs/heads/master: 42d53b4ff7d61487d18274ebdf1f70c1aef6f122
7 changes: 3 additions & 4 deletions trunk/lib/dma-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,9 @@ static void check_sync(struct device *dev,
ref->size);
}

if (entry->direction == DMA_BIDIRECTIONAL)
goto out;

if (ref->direction != entry->direction) {
err_printk(dev, entry, "DMA-API: device driver syncs "
"DMA memory with different direction "
Expand All @@ -923,9 +926,6 @@ static void check_sync(struct device *dev,
dir2name[ref->direction]);
}

if (entry->direction == DMA_BIDIRECTIONAL)
goto out;

if (to_cpu && !(entry->direction == DMA_FROM_DEVICE) &&
!(ref->direction == DMA_TO_DEVICE))
err_printk(dev, entry, "DMA-API: device driver syncs "
Expand All @@ -948,7 +948,6 @@ static void check_sync(struct device *dev,

out:
put_hash_bucket(bucket, &flags);

}

void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
Expand Down

0 comments on commit 0d1a62b

Please sign in to comment.