mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
This commit is contained in:
commit
d1d4a81b84
22 changed files with 2202 additions and 733 deletions
|
|
@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy)
|
|||
for (i = 0; i < psy->num_properties; i++) {
|
||||
if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
|
||||
psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
|
||||
psy, &psy_tzd_ops, 0, 0, 0, 0);
|
||||
psy, &psy_tzd_ops, 0, 0);
|
||||
if (IS_ERR(psy->tzd))
|
||||
return PTR_ERR(psy->tzd);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in a new issue