Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a6cd4b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish
  mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish
  mmc: tmio: fix .set_ios(MMC_POWER_UP) handling
  mmc: fix a race between card-detect rescan and clock-gate work instances
  mmc: omap: Fix possible NULL pointer deref
  mmc: core: mmc_add_card(): fix missing break in switch statement
  mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
parents bab0dcc7 0c9c99a7

drivers/mmc/core/bus.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -284,6 +284,7 @@ int mmc_add_card(struct mmc_card *card) 
		type = "SD-combo";

		type = "SD-combo";

		if (mmc_card_blockaddr(card))

		if (mmc_card_blockaddr(card))

			type = "SDHC-combo";

			type = "SDHC-combo";

		break;

	default:

	default:

		type = "?";

		type = "?";

		break;

		break;

drivers/mmc/core/host.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ static void mmc_host_clk_gate_delayed(struct mmc_host *host) 
		spin_unlock_irqrestore(&host->clk_lock, flags);

		spin_unlock_irqrestore(&host->clk_lock, flags);

		return;

		return;

	}

	}

	mutex_lock(&host->clk_gate_mutex);

	mmc_claim_host(host);

	spin_lock_irqsave(&host->clk_lock, flags);

	spin_lock_irqsave(&host->clk_lock, flags);

	if (!host->clk_requests) {

	if (!host->clk_requests) {

		spin_unlock_irqrestore(&host->clk_lock, flags);

		spin_unlock_irqrestore(&host->clk_lock, flags);
@@ -104,7 +104,7 @@ static void mmc_host_clk_gate_delayed(struct mmc_host *host) 
		pr_debug("%s: gated MCI clock\n", mmc_hostname(host));

		pr_debug("%s: gated MCI clock\n", mmc_hostname(host));

	}

	}

	spin_unlock_irqrestore(&host->clk_lock, flags);

	spin_unlock_irqrestore(&host->clk_lock, flags);

	mutex_unlock(&host->clk_gate_mutex);

	mmc_release_host(host);

}

}





/*

/*
@@ -130,7 +130,7 @@ void mmc_host_clk_ungate(struct mmc_host *host) 
{

{

	unsigned long flags;

	unsigned long flags;





	mutex_lock(&host->clk_gate_mutex);

	mmc_claim_host(host);

	spin_lock_irqsave(&host->clk_lock, flags);

	spin_lock_irqsave(&host->clk_lock, flags);

	if (host->clk_gated) {

	if (host->clk_gated) {

		spin_unlock_irqrestore(&host->clk_lock, flags);

		spin_unlock_irqrestore(&host->clk_lock, flags);
@@ -140,7 +140,7 @@ void mmc_host_clk_ungate(struct mmc_host *host) 
	}

	}

	host->clk_requests++;

	host->clk_requests++;

	spin_unlock_irqrestore(&host->clk_lock, flags);

	spin_unlock_irqrestore(&host->clk_lock, flags);

	mutex_unlock(&host->clk_gate_mutex);

	mmc_release_host(host);

}

}





/**

/**
@@ -215,7 +215,6 @@ static inline void mmc_host_clk_init(struct mmc_host *host) 
	host->clk_gated = false;

	host->clk_gated = false;

	INIT_WORK(&host->clk_gate_work, mmc_host_clk_gate_work);

	INIT_WORK(&host->clk_gate_work, mmc_host_clk_gate_work);

	spin_lock_init(&host->clk_lock);

	spin_lock_init(&host->clk_lock);

	mutex_init(&host->clk_gate_mutex);

}

}





/**

/**

drivers/mmc/host/omap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -832,7 +832,7 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id) 
		return IRQ_HANDLED;

		return IRQ_HANDLED;

	}

	}





	if (end_command)

	if (end_command && host->cmd)

		mmc_omap_cmd_done(host, host->cmd);

		mmc_omap_cmd_done(host, host->cmd);

	if (host->data != NULL) {

	if (host->data != NULL) {

		if (transfer_error)

		if (transfer_error)

drivers/mmc/host/sdhci-pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -957,6 +957,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( 
	host->ioaddr = pci_ioremap_bar(pdev, bar);

	host->ioaddr = pci_ioremap_bar(pdev, bar);

	if (!host->ioaddr) {

	if (!host->ioaddr) {

		dev_err(&pdev->dev, "failed to remap registers\n");

		dev_err(&pdev->dev, "failed to remap registers\n");

		ret = -ENOMEM;

		goto release;

		goto release;

	}

	}

drivers/mmc/host/sdhci.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -1334,6 +1334,13 @@ static void sdhci_tasklet_finish(unsigned long param) 




	host = (struct sdhci_host*)param;

	host = (struct sdhci_host*)param;





        /*

         * If this tasklet gets rescheduled while running, it will

         * be run again afterwards but without any active request.

         */

	if (!host->mrq)

		return;



	spin_lock_irqsave(&host->lock, flags);

	spin_lock_irqsave(&host->lock, flags);





	del_timer(&host->timer);

	del_timer(&host->timer);
@@ -1345,7 +1352,7 @@ static void sdhci_tasklet_finish(unsigned long param) 
	 * upon error conditions.

	 * upon error conditions.

	 */

	 */

	if (!(host->flags & SDHCI_DEVICE_DEAD) &&

	if (!(host->flags & SDHCI_DEVICE_DEAD) &&

		(mrq->cmd->error ||

	    ((mrq->cmd && mrq->cmd->error) ||

		 (mrq->data && (mrq->data->error ||

		 (mrq->data && (mrq->data->error ||

		  (mrq->data->stop && mrq->data->stop->error))) ||

		  (mrq->data->stop && mrq->data->stop->error))) ||

		   (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) {

		   (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) {