diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-04-13 13:59:14 +1000 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-04-22 15:25:53 +0200 |
| commit | 609d5a1b2b35bb62b4b3750396e55453160c2a17 (patch) | |
| tree | 3579cd0e2914a1636b6b62d288c468d3be69c809 /drivers/i2c | |
| parent | abaa7b0c1286ca1610a6dfa079e1d2e27dca1f25 (diff) | |
| download | linux-stable-609d5a1b2b35bb62b4b3750396e55453160c2a17.tar.gz linux-stable-609d5a1b2b35bb62b4b3750396e55453160c2a17.tar.bz2 linux-stable-609d5a1b2b35bb62b4b3750396e55453160c2a17.zip | |
i2c: cpm: Fix build break due to incompatible pointer types
Since commit ea8daa7b9784 ("kbuild: Add option to turn incompatible
pointer check into error"), assignments from an incompatible pointer
types have become a hard error, eg:
drivers/i2c/busses/i2c-cpm.c:545:91: error: passing argument 3 of
'dma_alloc_coherent' from incompatible pointer type
Fix the build break by converting txdma & rxdma to dma_addr_t.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
Fixes: ea8daa7b9784
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 714bdc837769..b167ab25310a 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -116,8 +116,8 @@ struct cpm_i2c { cbd_t __iomem *rbase; u_char *txbuf[CPM_MAXBD]; u_char *rxbuf[CPM_MAXBD]; - u32 txdma[CPM_MAXBD]; - u32 rxdma[CPM_MAXBD]; + dma_addr_t txdma[CPM_MAXBD]; + dma_addr_t rxdma[CPM_MAXBD]; }; static irqreturn_t cpm_i2c_interrupt(int irq, void *dev_id) |