projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
power: rk818-charger: move irq init to the last step
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
power
/
bq27320_battery.c
diff --git
a/drivers/power/bq27320_battery.c
b/drivers/power/bq27320_battery.c
index 349547f41af6529ad1ddbfe795a8375033914773..7d5e15ac15b37f51b90b91fa18c84834edd75a22 100755
(executable)
--- a/
drivers/power/bq27320_battery.c
+++ b/
drivers/power/bq27320_battery.c
@@
-1300,22
+1300,16
@@
static int bq27320_battery_probe(struct i2c_client *client,
bq27320_powersupply_init(di);
retval = power_supply_register(&client->dev, &di->bat);
bq27320_powersupply_init(di);
retval = power_supply_register(&client->dev, &di->bat);
- if (retval)
{
+ if (retval)
dev_err(&client->dev, "failed to register battery\n");
dev_err(&client->dev, "failed to register battery\n");
- goto batt_failed_4;
- }
-
+
retval = power_supply_register(&client->dev, &di->usb);
retval = power_supply_register(&client->dev, &di->usb);
- if (retval)
{
+ if (retval)
dev_err(&client->dev, "failed to register ac\n");
dev_err(&client->dev, "failed to register ac\n");
- goto batt_failed_4;
- }
retval = power_supply_register(&client->dev, &di->ac);
retval = power_supply_register(&client->dev, &di->ac);
- if (retval)
{
+ if (retval)
dev_err(&client->dev, "failed to register ac\n");
dev_err(&client->dev, "failed to register ac\n");
- goto batt_failed_4;
- }
g_bq27320_i2c_client = client;
g_bq27320_i2c_client = client;
@@
-1333,8
+1327,6
@@
static int bq27320_battery_probe(struct i2c_client *client,
return 0;
return 0;
-batt_failed_4:
- kfree(di);
batt_failed_3:
driver_remove_file(&(bq27320_battery_driver.driver), &driver_attr_state);
batt_failed_2:
batt_failed_3:
driver_remove_file(&(bq27320_battery_driver.driver), &driver_attr_state);
batt_failed_2:
@@
-1354,7
+1346,6
@@
static int bq27320_battery_remove(struct i2c_client *client)
kfree(di->bat.name);
kfree(di->usb.name);
kfree(di->ac.name);
kfree(di->bat.name);
kfree(di->usb.name);
kfree(di->ac.name);
- kfree(di);
return 0;
}
return 0;
}