summaryrefslogtreecommitdiffstats
path: root/drivers/remoteproc/remoteproc_core.c
diff options
context:
space:
mode:
authorAnton Arapov <anton@redhat.com>2012-06-25 18:57:38 +0200
committerAnton Arapov <anton@redhat.com>2012-06-25 18:57:38 +0200
commit3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54 (patch)
tree72cb222e8096ba95c04460df4de752875b062a23 /drivers/remoteproc/remoteproc_core.c
parent35df99f47c4246df74ed7571c692138b83c3c486 (diff)
downloadkernel-uprobes-3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54.tar.gz
kernel-uprobes-3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54.tar.xz
kernel-uprobes-3d6fafb8cd68b287130dbd5b19fbb5e9bfa32a54.zip
fedora kernel: 6c6f1b8594284404f143c407081ebe65fe068c81v3.4.4-1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'drivers/remoteproc/remoteproc_core.c')
-rw-r--r--drivers/remoteproc/remoteproc_core.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index e756a0df366..7591b9774d0 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -247,7 +247,7 @@ rproc_load_segments(struct rproc *rproc, const u8 *elf_data, size_t len)
}
if (offset + filesz > len) {
- dev_err(dev, "truncated fw: need 0x%x avail 0x%x\n",
+ dev_err(dev, "truncated fw: need 0x%x avail 0x%zx\n",
offset + filesz, len);
ret = -EINVAL;
break;
@@ -934,7 +934,7 @@ static void rproc_resource_cleanup(struct rproc *rproc)
unmapped = iommu_unmap(rproc->domain, entry->da, entry->len);
if (unmapped != entry->len) {
/* nothing much to do besides complaining */
- dev_err(dev, "failed to unmap %u/%u\n", entry->len,
+ dev_err(dev, "failed to unmap %u/%zu\n", entry->len,
unmapped);
}
@@ -1020,7 +1020,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
ehdr = (struct elf32_hdr *)fw->data;
- dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size);
+ dev_info(dev, "Booting fw image %s, size %zd\n", name, fw->size);
/*
* if enabling an IOMMU isn't relevant for this rproc, this is
@@ -1041,8 +1041,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
/* look for the resource table */
table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
- if (!table)
+ if (!table) {
+ ret = -EINVAL;
goto clean_up;
+ }
/* handle fw resources which are required to boot rproc */
ret = rproc_handle_boot_rsc(rproc, table, tablesz);