mirror of
https://github.com/torvalds/linux.git
synced 2024-11-02 02:01:29 +00:00
MMC fixes for 3.5-rc7:
- 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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJP/O1XAAoJEHNBYZ7TNxYM1H8QAI/qaOZgkVN8ecs53JM69G7q SVyqLez8d5luBKl0q5MPKMDHZqj8IojZc5R0tGzKLpGJom2P9S+HzgCuIlo20g4d SW3dbnaUIb3kVdpo9/VlDRB9YIxuwdtTYyfy8WtEvxZXTaFbV8scN4sAyDksoDUF LImFoVGGCcKNCVfk3EXIkvPiVUTTsH/ivhBKwCwZ8WWcpiFkh/8wDzYNeosgn3e3 RALBe/1OeB5+I4Ten0Mw3LuuKc5WL5CxNzxj90kQwKhhXL4KJaNqvaT8Y8L0rB3f DVlSUCNkoRBA7EJKfJ4lk7ur1XVsT07KEXGuNb1xioz2cGpX/A36+W/QWWULG36U NcNEgoAqWLSH4tfLcYdscUnSnDYfOS1l0GwCPSl8iKy5uKoYSS5I3RuFKsybZSLa /Wvh1ue5lsil72T9u90CyViRUGahekXKT2Y6/HtPWSj2CzVScTaD3bFFTn20xWCR 3AsrX0ORDrZ2QqT7ILYZ70kMu6EjN0Nn0AYTnA644K/7v4QRYMiY0PJ65rRx4BY+ hEQybBIatUiE9txiEGdZ6sXRxGwXrWdZT0a9TR6eMyYyYywB8rieU9JRTD74mGo6 Fejx3h4rK/pHce/Gl3vC2FcFaOxLu7aFtZxLvJdunuDVnL/JFZGkRlq7SUtsxLav fz4/zR3ifnDJDJyG/n+G =lLEH -----END PGP SIGNATURE----- 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"
This commit is contained in:
commit
2c91390027
@ -50,8 +50,8 @@ int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio)
|
|||||||
goto egpioreq;
|
goto egpioreq;
|
||||||
|
|
||||||
ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt,
|
ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt,
|
||||||
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
|
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
|
||||||
cd->label, host);
|
IRQF_ONESHOT, cd->label, host);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto eirqreq;
|
goto eirqreq;
|
||||||
|
|
||||||
|
@ -717,10 +717,6 @@ static int mmc_select_powerclass(struct mmc_card *card,
|
|||||||
card->ext_csd.generic_cmd6_time);
|
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;
|
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;
|
EXT_CSD_BUS_WIDTH_8 : EXT_CSD_BUS_WIDTH_4;
|
||||||
err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);
|
err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);
|
||||||
if (err)
|
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],
|
err = mmc_select_powerclass(card, ext_csd_bits[idx][0],
|
||||||
ext_csd);
|
ext_csd);
|
||||||
if (err)
|
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,
|
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
|
||||||
EXT_CSD_BUS_WIDTH,
|
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],
|
err = mmc_select_powerclass(card, ext_csd_bits[idx][1],
|
||||||
ext_csd);
|
ext_csd);
|
||||||
if (err)
|
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,
|
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
|
||||||
EXT_CSD_BUS_WIDTH,
|
EXT_CSD_BUS_WIDTH,
|
||||||
|
Loading…
Reference in New Issue
Block a user