projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'locking/urgent' into locking/core, to pick up fixes
[cascardo/linux.git]
/
drivers
/
i2c
/
busses
/
i2c-rcar.c
diff --git
a/drivers/i2c/busses/i2c-rcar.c
b/drivers/i2c/busses/i2c-rcar.c
index
52407f3
..
9bd849d
100644
(file)
--- a/
drivers/i2c/busses/i2c-rcar.c
+++ b/
drivers/i2c/busses/i2c-rcar.c
@@
-378,7
+378,7
@@
static void rcar_i2c_dma(struct rcar_i2c_priv *priv)
}
dma_addr = dma_map_single(chan->device->dev, buf, len, dir);
- if (dma_mapping_error(dev, dma_addr)) {
+ if (dma_mapping_error(
chan->device->
dev, dma_addr)) {
dev_dbg(dev, "dma map failed, using PIO\n");
return;
}