Merge "mmc: sdhci: remove incorrect spinlock release" into msm-4.9 (33ef82c6) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/host/sdhci.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1523,7 +1523,7 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);		sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);

	/* Wait max 20 ms */		/* Wait max 20 ms */
	timeout = 20000;		timeout = 20;
	while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))		while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
	& SDHCI_CLOCK_INT_STABLE)) {		& SDHCI_CLOCK_INT_STABLE)) {
	if (timeout == 0) {		if (timeout == 0) {
	@@ -1533,9 +1533,7 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
	return;		return;
	}		}
	timeout--;		timeout--;
	spin_unlock_irq(&host->lock);
	usleep_range(900, 1100);		usleep_range(900, 1100);
	spin_lock_irq(&host->lock);
	}		}

	clk \|= SDHCI_CLOCK_CARD_EN;		clk \|= SDHCI_CLOCK_CARD_EN;