Merge branch 'bits/002-backports' into asahi-wip

AsahiLinux · Sep 18, 2024 · 4fccab3 · 4fccab3
2 parents 9ea4c38 + bcc9ecf
commit 4fccab3
Show file tree

Hide file tree

Showing 4 changed files with 1,312 additions and 1,622 deletions.
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
@@ -1232,11 +1232,7 @@ EXPORT_SYMBOL_GPL(power_supply_set_property);
 int power_supply_property_is_writeable(struct power_supply *psy,
 					enum power_supply_property psp)
 {
-	if (atomic_read(&psy->use_cnt) <= 0 ||
-			!psy->desc->property_is_writeable)
-		return -ENODEV;
-
-	return psy->desc->property_is_writeable(psy, psp);
+	return psy->desc->property_is_writeable && psy->desc->property_is_writeable(psy, psp);
 }
 EXPORT_SYMBOL_GPL(power_supply_property_is_writeable);