diff options
author | Georges Savoundararadj <savoundg@gmail.com> | 2016-09-07 21:38:15 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2016-09-19 14:56:22 -0400 |
commit | 0610735928ee47870e083d5901caa371089216f1 (patch) | |
tree | eb5798b6c09efd4bd5012b3990cf7d4e94780fae | |
parent | 9edeaada19a21eb669ae0dfe749be88f1810ea92 (diff) |
power: bq24257: Fix use of uninitialized pointer bq->charger
bq->charger is initialized in bq24257_power_supply_init.
Therefore, bq24257_power_supply_init should be called before the
registration of the IRQ handler bq24257_irq_handler_thread that calls
power_supply_changed(bq->charger).
Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Aurelien Chanot <chanot.a@gmail.com>
Cc: Andreas Dannenberg <dannenberg@ti.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Fixes: 2219a935963e ("power_supply: Add TI BQ24257 charger driver")
Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r-- | drivers/power/supply/bq24257_charger.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/power/supply/bq24257_charger.c b/drivers/power/supply/bq24257_charger.c index 1fea2c7ef97f..6fc31bdc639b 100644 --- a/drivers/power/supply/bq24257_charger.c +++ b/drivers/power/supply/bq24257_charger.c | |||
@@ -1068,6 +1068,12 @@ static int bq24257_probe(struct i2c_client *client, | |||
1068 | return ret; | 1068 | return ret; |
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | ret = bq24257_power_supply_init(bq); | ||
1072 | if (ret < 0) { | ||
1073 | dev_err(dev, "Failed to register power supply\n"); | ||
1074 | return ret; | ||
1075 | } | ||
1076 | |||
1071 | ret = devm_request_threaded_irq(dev, client->irq, NULL, | 1077 | ret = devm_request_threaded_irq(dev, client->irq, NULL, |
1072 | bq24257_irq_handler_thread, | 1078 | bq24257_irq_handler_thread, |
1073 | IRQF_TRIGGER_FALLING | | 1079 | IRQF_TRIGGER_FALLING | |
@@ -1078,12 +1084,6 @@ static int bq24257_probe(struct i2c_client *client, | |||
1078 | return ret; | 1084 | return ret; |
1079 | } | 1085 | } |
1080 | 1086 | ||
1081 | ret = bq24257_power_supply_init(bq); | ||
1082 | if (ret < 0) { | ||
1083 | dev_err(dev, "Failed to register power supply\n"); | ||
1084 | return ret; | ||
1085 | } | ||
1086 | |||
1087 | ret = sysfs_create_group(&bq->charger->dev.kobj, &bq24257_attr_group); | 1087 | ret = sysfs_create_group(&bq->charger->dev.kobj, &bq24257_attr_group); |
1088 | if (ret < 0) { | 1088 | if (ret < 0) { |
1089 | dev_err(dev, "Can't create sysfs entries\n"); | 1089 | dev_err(dev, "Can't create sysfs entries\n"); |