summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2013-04-05 22:43:55 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-05 22:43:55 (GMT)
commit392aeab578c624bb00787b21d7a0b27f31785f23 (patch)
tree56d38ed817345321aa2d24add000d2f147298e92 /drivers/mmc
parentca1eff3e439fa5597da8cdf3f5b83ce962a0d912 (diff)
parent4d72f19861e95cf911e0336882f0958f39f5cad0 (diff)
downloadlinux-fsl-qoriq-392aeab578c624bb00787b21d7a0b27f31785f23.tar.xz
Merge tag 'v3.8.4-rt2'
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mmci.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 1507723..724f478 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -930,15 +930,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
struct sg_mapping_iter *sg_miter = &host->sg_miter;
struct variant_data *variant = host->variant;
void __iomem *base = host->base;
- unsigned long flags;
u32 status;
status = readl(base + MMCISTATUS);
dev_dbg(mmc_dev(host->mmc), "irq1 (pio) %08x\n", status);
- local_irq_save(flags);
-
do {
unsigned int remain, len;
char *buffer;
@@ -978,8 +975,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
sg_miter_stop(sg_miter);
- local_irq_restore(flags);
-
/*
* If we have less than the fifo 'half-full' threshold to transfer,
* trigger a PIO interrupt as soon as any data is available.