Merge tag 'timers-core-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / interconnect / core.c

diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index e5f9987..9e1ab70 100644 (file)
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -243,6 +243,7 @@ static int aggregate_requests(struct icc_node *node)
 {
        struct icc_provider *p = node->provider;
        struct icc_req *r;
+       u32 avg_bw, peak_bw;
 
        node->avg_bw = 0;
        node->peak_bw = 0;
@@ -251,9 +252,14 @@ static int aggregate_requests(struct icc_node *node)
                p->pre_aggregate(node);
 
        hlist_for_each_entry(r, &node->req_list, req_node) {
-               if (!r->enabled)
-                       continue;
-               p->aggregate(node, r->tag, r->avg_bw, r->peak_bw,
+               if (r->enabled) {
+                       avg_bw = r->avg_bw;
+                       peak_bw = r->peak_bw;
+               } else {
+                       avg_bw = 0;
+                       peak_bw = 0;
+               }
+               p->aggregate(node, r->tag, avg_bw, peak_bw,
                             &node->avg_bw, &node->peak_bw);
        }