Commit b303c16c authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 91132078 202500d2

drivers/mmc/core/block.c

+1 −1
Original line number Diff line number Diff line
@@ -2484,8 +2484,8 @@ static int mmc_rpmb_chrdev_release(struct inode *inode, struct file *filp) 
	struct mmc_rpmb_data *rpmb = container_of(inode->i_cdev,

						  struct mmc_rpmb_data, chrdev);



	put_device(&rpmb->dev);

	mmc_blk_put(rpmb->md);

	put_device(&rpmb->dev);



	return 0;

}

drivers/mmc/host/sdhci.c

+6 −3
Original line number Diff line number Diff line
@@ -4138,9 +4138,6 @@ int sdhci_setup_host(struct sdhci_host *host) 
		       mmc_hostname(mmc), host->version);

	}



	if (host->quirks & SDHCI_QUIRK_BROKEN_CQE)

		mmc->caps2 &= ~MMC_CAP2_CQE;



	if (host->quirks & SDHCI_QUIRK_FORCE_DMA)

		host->flags |= SDHCI_USE_SDMA;

	else if (!(host->caps & SDHCI_CAN_DO_SDMA))
@@ -4669,6 +4666,12 @@ int __sdhci_add_host(struct sdhci_host *host) 
	struct mmc_host *mmc = host->mmc;

	int ret;



	if ((mmc->caps2 & MMC_CAP2_CQE) &&

	    (host->quirks & SDHCI_QUIRK_BROKEN_CQE)) {

		mmc->caps2 &= ~MMC_CAP2_CQE;

		mmc->cqe_ops = NULL;

	}



	host->complete_wq = alloc_workqueue("sdhci", flags, 0);

	if (!host->complete_wq)

		return -ENOMEM;