diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2019-01-15 18:40:20 +0000 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2019-01-15 18:41:08 +0000 |
commit | ada795fa8e7b1e27c134fe7d5aedf4517cd082f5 (patch) | |
tree | 5717f98c75f6b1a9fbae50b88c35f13d07993226 /platform-intel.c | |
parent | 88ee7cfa1e00aabcfc8f48b57f4b226e7b5c2158 (diff) |
New upstream release
* New upstream release
* Cherrypick patches from master up to 757e55435997e355ee9b03e5d913b5496a3c39a8.
Diffstat (limited to 'platform-intel.c')
-rw-r--r-- | platform-intel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform-intel.c b/platform-intel.c index a11101db..04bffc57 100644 --- a/platform-intel.c +++ b/platform-intel.c @@ -371,6 +371,9 @@ static int scan(const void *start, const void *end, const void *data) if (__le16_to_cpu(ptr->vendorID) != 0x8086) return 0; + if (get_orom_by_device_id(ptr->deviceID)) + return 0; + for (offset = 0; offset < len; offset += 4) { const void *mem = start + offset; |