diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:12 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:12 +0000 |
| commit | 76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 (patch) | |
| tree | bcd8a465296d90b88f188cea2c6ca6cde01b7480 /drivers/i2c | |
| parent | c520396b96bc826ff0f2df8aeead5b76df316e0c (diff) | |
fix-rebase-dust.patch
Last rebase to stable-2.6.26 left some trash from rebasing the patches on top of this,
clean it back out
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index 84e3e460901..acc7011276a 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -689,7 +689,7 @@ reschedule: int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf, unsigned int ma) { - /* can happen if he calls with pcf50633_global before probe + /* can happen if he calls before probe * have to bail with error since we can't even schedule the work */ if (!pcf) { @@ -2176,8 +2176,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) goto exit_free; } - pcf50633_global = pcf; - populate_sysfs_group(pcf); err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group); @@ -2226,10 +2224,10 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind) * LEDOUT register can be reset by disabling and enabling the * LED converter via control bit led_on in the LEDENA register" */ - reg_write(pcf, PCF50633_REG_LEDENA, 0x00); - reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); - reg_write(pcf, PCF50633_REG_LEDENA, 0x01); - reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); + pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x00); + pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01); + pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01); + pcf50633_reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f); err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING, "pcf50633", pcf); @@ -2490,8 +2488,6 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state) mutex_unlock(&pcf->lock); - pcf->is_suspended = 1; - activate_all_resume_dependencies(&pcf->resume_dependency); return 0; } |