Applied assortment of Arch Linux ARM patches

2025-04-07 00:16:08 -05:00
parent 25c6d769f4
commit 4822424518
39 changed files with 419 additions and 275 deletions
--- a/drivers/thermal/tegra_soctherm.c
+++ b/drivers/thermal/tegra_soctherm.c
@@ -1406,7 +1406,7 @@ static int soctherm_init_platform_data(struct platform_device *pdev)
 		therm = &plat_data->therm[tsensor2therm_map[i]];
 		s = &plat_data->sensor_data[i];
 		s->sensor_enable = s->zone_enable;
-		s->sensor_enable = s->sensor_enable ?: therm->zone_enable;
+		s->sensor_enable = s->sensor_enable ? s->sensor_enable : therm->zone_enable;
 	}

 	/* Pdiv */