diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2020-09-28 13:17:36 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2020-09-28 13:17:36 +0300 |
| commit | 21685f9a7d7cdb3f68d83352377571fb24d03134 (patch) | |
| tree | 73effe4466ee700fa85be940a00bd03785faf6fb /drivers/mmc | |
| parent | 94d4c3cffefc702da2f906bfc68b774659f1c8fc (diff) | |
| parent | afd7f30886b0b445a4240a99020458a9772f2b89 (diff) | |
| download | linux-21685f9a7d7cdb3f68d83352377571fb24d03134.tar.xz | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-pci-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index d0c8d39d5dbd..23da7f7fe093 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -937,7 +937,8 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) static bool glk_broken_cqhci(struct sdhci_pci_slot *slot) { return slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_EMMC && - dmi_match(DMI_BIOS_VENDOR, "LENOVO"); + (dmi_match(DMI_BIOS_VENDOR, "LENOVO") || + dmi_match(DMI_SYS_VENDOR, "IRBIS")); } static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot) |