diff options
| author | Benn Pörscke <benn.porscke@stericsson.com> | 2011-12-16 15:04:55 +0100 |
|---|---|---|
| committer | Benn Pörscke <benn.porscke@stericsson.com> | 2011-12-16 15:04:55 +0100 |
| commit | 93f379e6cfadfded0d262192ca69d1abc096d90e (patch) | |
| tree | 43f180e31ee26ee94f7d2dd559132c30c6476b4d /drivers/power | |
| parent | 77955e37bd395f789900b8e180991ad67cabd899 (diff) | |
Squashandroid-20111223
Change-Id: I2fcf46d1fc4b0cd4c61e5be3654c43b80db86015
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/ab5500_charger.c | 3 | ||||
| -rw-r--r-- | drivers/power/ab8500_charger.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/power/ab5500_charger.c b/drivers/power/ab5500_charger.c index f57e2088a4a..b90c51a4f31 100644 --- a/drivers/power/ab5500_charger.c +++ b/drivers/power/ab5500_charger.c @@ -1309,7 +1309,8 @@ static irqreturn_t ab5500_charger_usblinkstatus_handler(int irq, void *_di) dev_dbg(di->dev, "USB link status changed\n"); - queue_work(di->charger_wq, &di->usb_link_status_work); + if (!di->usb.charger_online) + queue_work(di->charger_wq, &di->usb_link_status_work); return IRQ_HANDLED; } diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index f0d04c7c6d3..ffb66b8e627 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -2331,6 +2331,9 @@ static int ab8500_charger_usb_notifier_call(struct notifier_block *nb, else /* Should never occur */ bm_usb_state = AB8500_BM_USB_STATE_RESET_FS; + if (di == NULL) + return; + dev_dbg(di->dev, "%s usb_state: 0x%02x mA: %d\n", __func__, bm_usb_state, mA); |