]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
component: fix loop condition to call unbind() if bind() fails
authorBanajit Goswami <bgoswami@codeaurora.org>
Tue, 28 Aug 2018 04:15:39 +0000 (21:15 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2018 20:37:16 +0000 (22:37 +0200)
During component_bind_all(), if bind() fails for any
particular component associated with a master, unbind()
should be called for all previous components in that
master's match array, whose bind() might have completed
successfully. As per the current logic, if bind() fails
for the component at position 'n' in the master's match
array, it would start calling unbind() from component in
'n'th position itself and work backwards, and will always
skip calling unbind() for component in 0th position in the
master's match array.
Fix this by updating the loop condition, and the logic to
refer to the components in master's match array, so that
unbind() is called for all components starting from 'n-1'st
position in the array, until (and including) component in
0th position.

Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/component.c

index 8946dfee4768e8a82fb35f994b4e9ff2b88c245a..e8d676fad0c95600f426d36796c0ffac270ae98d 100644 (file)
@@ -536,9 +536,9 @@ int component_bind_all(struct device *master_dev, void *data)
                }
 
        if (ret != 0) {
-               for (; i--; )
-                       if (!master->match->compare[i].duplicate) {
-                               c = master->match->compare[i].component;
+               for (; i > 0; i--)
+                       if (!master->match->compare[i - 1].duplicate) {
+                               c = master->match->compare[i - 1].component;
                                component_unbind(c, master, data);
                        }
        }