Commit 2c913900 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-fixes-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

Pull MMC fixes from Chris Ball:
 - Revert a patch that made failing to select power class fatal;
   it turns out that it fails non-fatally on Tegra boards.
   Regression against 3.5-rc1.
 - Add the IRQF_ONESHOT flag to the cd-gpio driver, which turned
   into a regression in 3.5-rc1 when IRQF_ONESHOT became required
   for threaded IRQs with no handler.

* tag 'mmc-fixes-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: cd-gpio: pass IRQF_ONESHOT to request_threaded_irq()
  mmc: core: Revert "skip card initialization if power class selection fails"
parents 36ec9fbf 623b51fc

drivers/mmc/core/cd-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio) 
		goto egpioreq;



	ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt,

				   IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				   cd->label, host);

				   IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |

				   IRQF_ONESHOT, cd->label, host);

	if (ret < 0)

		goto eirqreq;

drivers/mmc/core/mmc.c

+11 −7
Original line number Diff line number Diff line
@@ -717,10 +717,6 @@ static int mmc_select_powerclass(struct mmc_card *card, 
				 card->ext_csd.generic_cmd6_time);

	}



	if (err)

		pr_err("%s: power class selection for ext_csd_bus_width %d"

		       " failed\n", mmc_hostname(card->host), bus_width);



	return err;

}
@@ -1104,7 +1100,9 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
				EXT_CSD_BUS_WIDTH_8 : EXT_CSD_BUS_WIDTH_4;

		err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);

		if (err)

			goto err;

			pr_warning("%s: power class selection to bus width %d"

				   " failed\n", mmc_hostname(card->host),

				   1 << bus_width);

	}



	/*
@@ -1136,7 +1134,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
			err = mmc_select_powerclass(card, ext_csd_bits[idx][0],

						    ext_csd);

			if (err)

				goto err;

				pr_warning("%s: power class selection to "

					   "bus width %d failed\n",

					   mmc_hostname(card->host),

					   1 << bus_width);



			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					 EXT_CSD_BUS_WIDTH,
@@ -1164,7 +1165,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
			err = mmc_select_powerclass(card, ext_csd_bits[idx][1],

						    ext_csd);

			if (err)

				goto err;

				pr_warning("%s: power class selection to "

					   "bus width %d ddr %d failed\n",

					   mmc_hostname(card->host),

					   1 << bus_width, ddr);



			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					 EXT_CSD_BUS_WIDTH,

CRA Git | Maintained and supported by SUSTech CRA and CCSE