shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 09:41:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

greybus: power_supply: fix name setting location

Browse Source 
We were checking for existing power supply names in the wrong place,
i.e, we were checking before any of the module power supply were
registered, because of that of course no name collision was detected.

Move the check to the register loop and with that we guarantee that this
mechanism works for greybus power supply naming.

Tested: using gbsim and using power supply with the same name and check
that: 1. no problems creating sysfs entries; 2. naming is done following
the desired rules.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Rui Miguel Silva
2016-08-26 11:52:05 +01:00
committed by Greg Kroah-Hartman
parent cc43368a3c
commit 6ac9166d4e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/greybus/power_supply.c
View File

@@ -870,19 +870,19 @@ static int gb_power_supply_config(struct gb_power_supplies *supplies, int id)
if (ret < 0)
return ret;
ret = gb_power_supply_prop_descriptors_get(gbpsy);
if (ret < 0)
return ret;
/* guarantee that we have an unique name, before register */
return __gb_power_supply_set_name(gbpsy->model_name, gbpsy->name,
sizeof(gbpsy->name));
return gb_power_supply_prop_descriptors_get(gbpsy);
}
static int gb_power_supply_enable(struct gb_power_supply *gbpsy)
{
int ret;
/* guarantee that we have an unique name, before register */
ret = __gb_power_supply_set_name(gbpsy->model_name, gbpsy->name,
sizeof(gbpsy->name));
if (ret < 0)
return ret;
ret = gb_power_supply_register(gbpsy);
if (ret < 0)
return ret;