projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
[linux-2.6-block.git]
/
drivers
/
i2c
/
busses
/
i2c-sh_mobile.c
diff --git
a/drivers/i2c/busses/i2c-sh_mobile.c
b/drivers/i2c/busses/i2c-sh_mobile.c
index 50f276e8d17967f7ef124e138502e77e6181586e..192f36f00e4d3d345e556e75da9ee6b826604104 100644
(file)
--- a/
drivers/i2c/busses/i2c-sh_mobile.c
+++ b/
drivers/i2c/busses/i2c-sh_mobile.c
@@
-610,7
+610,7
@@
static void sh_mobile_i2c_xfer_dma(struct sh_mobile_i2c_data *pd)
return;
dma_addr = dma_map_single(chan->device->dev, pd->msg->buf, pd->msg->len, dir);
- if (dma_mapping_error(
pd
->dev, dma_addr)) {
+ if (dma_mapping_error(
chan->device
->dev, dma_addr)) {
dev_dbg(pd->dev, "dma map failed, using PIO\n");
return;
}