diff options
| author | Simon Wilson <simonwilson@google.com> | 2010-10-07 14:00:04 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:46:19 -0800 |
| commit | 8c952b7ac1eeae65d92e08622c62d9230f752464 (patch) | |
| tree | b4b3fadbd87dbf5ada1e3814664b7e907029f606 /drivers/power | |
| parent | 591b775a981f938db916c0f96e7a5b349944000a (diff) | |
| download | kernel_samsung_crespo-8c952b7ac1eeae65d92e08622c62d9230f752464.zip kernel_samsung_crespo-8c952b7ac1eeae65d92e08622c62d9230f752464.tar.gz kernel_samsung_crespo-8c952b7ac1eeae65d92e08622c62d9230f752464.tar.bz2 | |
power: max17040: check for pdata before using charger_online
Signed-off-by: Simon Wilson <simonwilson@google.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/max17040_battery.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index 0255671..13cef46 100644 --- a/drivers/power/max17040_battery.c +++ b/drivers/power/max17040_battery.c @@ -158,7 +158,8 @@ static void max17040_get_status(struct i2c_client *client) { struct max17040_chip *chip = i2c_get_clientdata(client); - if (chip->pdata && (!chip->pdata->charger_online || !chip->pdata->charger_enable)) { + if (!chip->pdata || !chip->pdata->charger_online || + !chip->pdata->charger_enable) { chip->status = POWER_SUPPLY_STATUS_UNKNOWN; return; } |