Commit 249d0fa9 authored by David Brownell's avatar David Brownell Committed by Pierre Ossman

omap_hsmmc: card detect irq bugfix

Work around lockdep issue when card detect IRQ handlers run in
thread context ... it forces IRQF_DISABLED, which prevents all
access to twl4030 card detect signals.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 5dbace0c
...@@ -517,6 +517,9 @@ static void mmc_omap_detect(struct work_struct *work) ...@@ -517,6 +517,9 @@ static void mmc_omap_detect(struct work_struct *work)
{ {
struct mmc_omap_host *host = container_of(work, struct mmc_omap_host, struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
mmc_carddetect_work); mmc_carddetect_work);
struct omap_mmc_slot_data *slot = &mmc_slot(host);
host->carddetect = slot->card_detect(slot->card_detect_irq);
sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch"); sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch");
if (host->carddetect) { if (host->carddetect) {
...@@ -538,7 +541,6 @@ static irqreturn_t omap_mmc_cd_handler(int irq, void *dev_id) ...@@ -538,7 +541,6 @@ static irqreturn_t omap_mmc_cd_handler(int irq, void *dev_id)
{ {
struct mmc_omap_host *host = (struct mmc_omap_host *)dev_id; struct mmc_omap_host *host = (struct mmc_omap_host *)dev_id;
host->carddetect = mmc_slot(host).card_detect(irq);
schedule_work(&host->mmc_carddetect_work); schedule_work(&host->mmc_carddetect_work);
return IRQ_HANDLED; return IRQ_HANDLED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment