Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258170
b: refs/heads/master
c: e2f521e
h: refs/heads/master
v: v3
  • Loading branch information
Russell King committed Jul 3, 2011
1 parent 250dfd1 commit 8f5ff3b
Show file tree
Hide file tree
Showing 2 changed files with 2 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: dd3641fc3cf6d10b7cf4e266c2f651517779e727
refs/heads/master: e2f521e247576c897e1bf0ada801e87c7e2db89f
5 changes: 1 addition & 4 deletions trunk/arch/arm/common/dmabounce.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,7 @@ static struct safe_buffer *find_safe_buffer_dev(struct device *dev,
if (!dev || !dev->archdata.dmabounce)
return NULL;
if (dma_mapping_error(dev, dma_addr)) {
if (dev)
dev_err(dev, "Trying to %s invalid mapping\n", where);
else
pr_err("unknown device: Trying to %s invalid mapping\n", where);
dev_err(dev, "Trying to %s invalid mapping\n", where);
return NULL;
}
return find_safe_buffer(dev->archdata.dmabounce, dma_addr);
Expand Down

0 comments on commit 8f5ff3b

Please sign in to comment.