diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
| commit | 943550a24c51bdd971f579200f286241548deaf7 (patch) | |
| tree | 4b275941890744cf4ea588ea59db7cd6558647b6 /drivers/video/adf/adf_client.c | |
| parent | 0356888ad14044efe98b16a731ba56d74b89269e (diff) | |
| parent | a3b71254e95dc167ddca600c0ca426e8ce2fad3f (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-androidlsk-android-14.03
Conflicts:
arch/arm64/include/asm/cmpxchg.h
drivers/cpufreq/cpufreq.c
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/xt_qtaguid.c
Diffstat (limited to 'drivers/video/adf/adf_client.c')
| -rw-r--r-- | drivers/video/adf/adf_client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/adf/adf_client.c b/drivers/video/adf/adf_client.c index bba873d34bbb..8061d8e6b9fb 100644 --- a/drivers/video/adf/adf_client.c +++ b/drivers/video/adf/adf_client.c @@ -283,7 +283,7 @@ static int adf_buffer_map(struct adf_device *dev, struct adf_buffer *buf, attachment = dma_buf_attach(buf->dma_bufs[i], dev->dev); if (IS_ERR(attachment)) { ret = PTR_ERR(attachment); - dev_err(&dev->base.dev, "attaching plane %u failed: %d\n", + dev_err(&dev->base.dev, "attaching plane %zu failed: %d\n", i, ret); goto done; } @@ -292,12 +292,13 @@ static int adf_buffer_map(struct adf_device *dev, struct adf_buffer *buf, sg_table = dma_buf_map_attachment(attachment, DMA_TO_DEVICE); if (IS_ERR(sg_table)) { ret = PTR_ERR(sg_table); - dev_err(&dev->base.dev, "mapping plane %u failed: %d", + dev_err(&dev->base.dev, "mapping plane %zu failed: %d", i, ret); goto done; } else if (!sg_table) { ret = -ENOMEM; - dev_err(&dev->base.dev, "mapping plane %u failed\n", i); + dev_err(&dev->base.dev, "mapping plane %zu failed\n", + i); goto done; } mapping->sg_tables[i] = sg_table; |