greybus: Random spell fixes

[karo-tx-linux.git] / drivers / staging / greybus / manifest.c

diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index 6b2c5ee03458cc31aa19b5d2e1f402092620710c..28abd2ad395e914da398246df2510622c46c6ae8 100644 (file)
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -46,7 +46,7 @@ static void release_manifest_descriptors(void)
 
 /*
  * Validate the given descriptor.  Its reported size must fit within
- * the number of bytes reamining, and it must have a recognized
+ * the number of bytes remaining, and it must have a recognized
  * type.  Check that the reported size is at least as big as what
  * we expect to see.  (It could be bigger, perhaps for a new version
  * of the format.)
@@ -54,8 +54,7 @@ static void release_manifest_descriptors(void)
  * Returns the number of bytes consumed by the descriptor, or a
  * negative errno.
  */
-static int identify_descriptor(struct greybus_descriptor *desc, size_t size,
-                              bool *is_module)
+static int identify_descriptor(struct greybus_descriptor *desc, size_t size)
 {
        struct greybus_descriptor_header *desc_header = &desc->header;
        struct manifest_desc *descriptor;
@@ -80,10 +79,9 @@ static int identify_descriptor(struct greybus_descriptor *desc, size_t size,
                                desc_size);
                        return -EINVAL;
                }
-               *is_module = true;
                break;
        case GREYBUS_TYPE_STRING:
-               expected_size = sizeof(struct greybus_descriptor_header);
+               expected_size = sizeof(*desc_header);
                expected_size += sizeof(struct greybus_descriptor_string);
                expected_size += (size_t)desc->string.length;
                if (desc_size < expected_size) {
@@ -311,7 +309,7 @@ out_free_vendor_string:
  * the descriptors it contains, keeping track for each its type
  * and the location size of its data in the buffer.
  *
- * We also identify the module descriptor during this iteration,
+ * Next we scan the descriptors, looking for a module descriptor;
  * there must be exactly one of those.  When found, we record the
  * information it contains, and then remove that descriptor (and any
  * string descriptors it refers to) from further consideration.
@@ -332,6 +330,10 @@ bool gb_manifest_parse(struct gb_module *gmod, void *data, size_t size)
        u32 found = 0;
        bool result;
 
+       /* Manifest descriptor list should be empty here */
+       if (WARN_ON(!list_empty(&manifest_descs)))
+               return false;
+
        /* we have to have at _least_ the manifest header */
        if (size <= sizeof(manifest->header)) {
                pr_err("short manifest (%zu)\n", size);
@@ -361,9 +363,8 @@ bool gb_manifest_parse(struct gb_module *gmod, void *data, size_t size)
        size -= sizeof(*header);
        while (size) {
                int desc_size;
-               bool is_module = false;
 
-               desc_size = identify_descriptor(desc, size, &is_module);
+               desc_size = identify_descriptor(desc, size);
                if (desc_size <= 0) {
                        if (!desc_size)
                                pr_err("zero-sized manifest descriptor\n");
@@ -372,17 +373,19 @@ bool gb_manifest_parse(struct gb_module *gmod, void *data, size_t size)
                }
                desc = (struct greybus_descriptor *)((char *)desc + desc_size);
                size -= desc_size;
+       }
 
-               if (is_module) {
-                       if (++found > 1) {
-                               pr_err("manifest must have 1 module descriptor (%u found)\n",
-                                       found);
-                               result = false;
-                               goto out;
-                       } else {
+       /* There must be a single module descriptor */
+       list_for_each_entry(descriptor, &manifest_descs, links) {
+               if (descriptor->type == GREYBUS_TYPE_MODULE)
+                       if (!found++)
                                module_desc = descriptor;
-                       }
-               }
+       }
+       if (found != 1) {
+               pr_err("manifest must have 1 module descriptor (%u found)\n",
+                       found);
+               result = false;
+               goto out;
        }
 
        /* Parse the module manifest, starting with the module descriptor */