mainline inclusion
from mainline-v5.6-rc1
commit c7402379
category: bugfix
bugzilla: NA
CVE: NA

--------------------------------

Bail out if we match the OEM information, to save some possible
extra iteration.

Also update the code to fix minor coding style issue.
Signed-off-by: NHanjun Guo <guohanjun@huawei.com>
[ rjw: Subject ]
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>