diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-06-22 16:36:47 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-06-23 23:16:15 -0700 |
| commit | b08488bea5929f14b1e08d701652427bf63a9b47 (patch) | |
| tree | 4d1b662847756e8de350ff0f0711803093b983a3 /drivers/staging/greybus/manifest.c | |
| parent | 3b6ecd6de6b4d8aad200d256b0c09d536a15df29 (diff) | |
| download | op-kernel-dev-b08488bea5929f14b1e08d701652427bf63a9b47.zip op-kernel-dev-b08488bea5929f14b1e08d701652427bf63a9b47.tar.gz | |
greybus: manifest: Allow bundles/connections list to be non-empty at manifest parsing
A connection and a bundle will be created for interfaces at the very
beginning for control protocol's functioning. And so the list of bundles
and connections for a interface will be non-empty by the time manifest
is parsed.
Currently we are firing a WARN when these lists are found to be
non-empty. Lets fix that to contain single bundle and connection for
control protocol.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/manifest.c')
| -rw-r--r-- | drivers/staging/greybus/manifest.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c index ad55a73..377c449 100644 --- a/drivers/staging/greybus/manifest.c +++ b/drivers/staging/greybus/manifest.c @@ -208,9 +208,6 @@ static u32 gb_manifest_parse_cports(struct gb_bundle *bundle) u8 bundle_id = bundle->id; u32 count = 0; - if (WARN_ON(!list_empty(&bundle->connections))) - return 0; - /* Set up all cport descriptors associated with this bundle */ list_for_each_entry_safe(desc, next, &intf->manifest_descs, links) { struct greybus_descriptor_cport *desc_cport; @@ -263,9 +260,6 @@ static u32 gb_manifest_parse_bundles(struct gb_interface *intf) struct gb_bundle *bundle_next; u32 count = 0; - if (WARN_ON(!list_empty(&intf->bundles))) - return 0; - list_for_each_entry_safe(desc, next, &intf->manifest_descs, links) { struct greybus_descriptor_bundle *desc_bundle; |
