diff options
| author | warmcat <andy@warmcat.com> | 2008-11-19 17:09:33 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:33 +0000 |
| commit | 54e9d11cebb37fafb4928273bd5fd4ee7cd49f55 (patch) | |
| tree | d65b221fcce666ea68d799332c66d40378418cc8 /drivers | |
| parent | 1b608a5f6d7cc60c64f654d27b8557a8a69997c9 (diff) | |
fix-s3c2410_timer_setup-resume-BUG.patch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index e23c540d15d..91b9ac332e1 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -1926,9 +1926,11 @@ static int pcf50633_resume(struct device *dev) struct pcf50633_data *pcf = i2c_get_clientdata(client); int i; - mutex_lock(&pcf->lock); + printk(KERN_INFO"a\n"); + /* mutex_lock(&pcf->lock); */ /* resume in atomic context */ __reg_write(pcf, PCF50633_REG_LEDENA, 0x01); + printk(KERN_INFO"b\n"); /* Resume all saved registers that don't "survive" standby state */ __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m); @@ -1936,6 +1938,7 @@ static int pcf50633_resume(struct device *dev) __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m); __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m); __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m); + printk(KERN_INFO"c\n"); __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2); __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout); @@ -1949,14 +1952,16 @@ static int pcf50633_resume(struct device *dev) __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout); __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena); __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim); + printk(KERN_INFO"d\n"); /* FIXME: one big read? */ for (i = 0; i < 7; i++) { u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i; __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out); __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena); } + printk(KERN_INFO"e\n"); - mutex_unlock(&pcf->lock); + /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */ pcf50633_irq(pcf->irq, pcf); |