Backporting upstream fix since the uprev from 5.60 -> 5.61 does include
some minor functionality changes.
(From OE-Core rev: 0559cba2b46883e2d0178d611b164814a989df37)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>