aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-12-18 18:22:00 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-18 18:22:00 +0000
commit74f1328174d5e2b78285ae68121b52c2d34d0f0a (patch)
treee32f0863454de543720a9e81ea236f90d60dce23 /drivers/mfd
parent9bf7c63a3280146fd34ee3729f90ed4cad6defbb (diff)
fix-add-gratuiutous-pcf50633-timeout-tickle-in-isr.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/pcf50633-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 6634558ea91..bdf93c1db67 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -274,6 +274,8 @@ static void pcf50633_irq_worker(struct work_struct *work)
goto reschedule;
}
+ pcf50633_reg_write(pcf, PCF50633_REG_OOCSHDWN, 0x04 ); /* defeat 8s death from lowsys on A5 */
+
/* We immediately read the usb and adapter status. We thus make sure
* only of USBINS/USBREM and ADAPINS/ADPREM IRQ handlers are called */
if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {
@@ -377,8 +379,6 @@ static irqreturn_t pcf50633_irq(int irq, void *data)
{
struct pcf50633 *pcf = data;
- printk(KERN_ERR "pcf50633_irq\n");
-
get_device(pcf->dev);
disable_irq(pcf->irq);