Commit 21685f9a authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 94d4c3cf afd7f308

drivers/memstick/core/memstick.c

+4 −0
Original line number Diff line number Diff line
@@ -441,6 +441,9 @@ static void memstick_check(struct work_struct *work) 
	} else if (host->card->stop)

		host->card->stop(host->card);



	if (host->removing)

		goto out_power_off;



	card = memstick_alloc_card(host);



	if (!card) {
@@ -545,6 +548,7 @@ EXPORT_SYMBOL(memstick_add_host); 
 */

void memstick_remove_host(struct memstick_host *host)

{

	host->removing = 1;

	flush_workqueue(workqueue);

	mutex_lock(&host->lock);

	if (host->card)

drivers/mmc/host/sdhci-pci-core.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/memstick.h

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ struct memstick_host { 


	struct memstick_dev *card;

	unsigned int        retries;

	bool removing;



	/* Notify the host that some requests are pending. */

	void                (*request)(struct memstick_host *host);