tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'mmc-v5.9-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:

- Fix deadlock when removing MEMSTICK host

- Workaround broken CMDQ on Intel GLK based IRBIS models

* tag 'mmc-v5.9-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models
memstick: Skip allocating card when removing host

Linus Torvalds 2270b890 09a6b0bc

+7 -1
+4
drivers/memstick/core/memstick.c
··· 441 441 } else if (host->card->stop) 442 442 host->card->stop(host->card); 443 443 444 + if (host->removing) 445 + goto out_power_off; 446 + 444 447 card = memstick_alloc_card(host); 445 448 446 449 if (!card) { ··· 548 545 */ 549 546 void memstick_remove_host(struct memstick_host *host) 550 547 { 548 + host->removing = 1; 551 549 flush_workqueue(workqueue); 552 550 mutex_lock(&host->lock); 553 551 if (host->card)
+2 -1
drivers/mmc/host/sdhci-pci-core.c
··· 794 794 static bool glk_broken_cqhci(struct sdhci_pci_slot *slot) 795 795 { 796 796 return slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_EMMC && 797 - dmi_match(DMI_BIOS_VENDOR, "LENOVO"); 797 + (dmi_match(DMI_BIOS_VENDOR, "LENOVO") || 798 + dmi_match(DMI_SYS_VENDOR, "IRBIS")); 798 799 } 799 800 800 801 static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot)
+1
include/linux/memstick.h
··· 281 281 282 282 struct memstick_dev *card; 283 283 unsigned int retries; 284 + bool removing; 284 285 285 286 /* Notify the host that some requests are pending. */ 286 287 void (*request)(struct memstick_host *host);