diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-19 18:44:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-19 18:44:09 -0700 |
| commit | a71d6e0d6fe098cda4e5de1ceb202b64f963f60c (patch) | |
| tree | 5ad22381920f04cda98ff563c04adebb2ecdd345 /drivers/mfd/pcf50633-core.c | |
| parent | fbb5ba92766a0a7803635f053220c325d26def9c (diff) | |
| parent | f43ab901005c2bb3c5440e91b6efae9f5db02e7c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: pcf50633: fix unsafe disable_irq()
mfd: Keep a cache of WM8350 volatile values
Diffstat (limited to 'drivers/mfd/pcf50633-core.c')
| -rw-r--r-- | drivers/mfd/pcf50633-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 7793932a513b..11a6248cc1c1 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -443,7 +443,7 @@ static irqreturn_t pcf50633_irq(int irq, void *data) dev_dbg(pcf->dev, "pcf50633_irq\n"); get_device(pcf->dev); - disable_irq(pcf->irq); + disable_irq_nosync(pcf->irq); schedule_work(&pcf->irq_work); return IRQ_HANDLED; |