Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management & ACPI update from Zhang Rui,
Ho humm. Normally these things go through Len. But it's just three
small fixes, I guess I can pull directly too.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
ACPI video: Ignore errors after _DOD evaluation.
thermal: solve compilation errors in rcar_thermal
+9
-6
+7
-4
drivers/acpi/video.c
+7
-4
drivers/acpi/video.c
···
1345
1345
acpi_video_bus_get_devices(struct acpi_video_bus *video,
1346
1346
struct acpi_device *device)
1347
1347
{
1348
-
int status;
1348
+
int status = 0;
1349
1349
struct acpi_device *dev;
1350
1350
1351
-
status = acpi_video_device_enumerate(video);
1352
-
if (status)
1353
-
return status;
1351
+
/*
1352
+
* There are systems where video module known to work fine regardless
1353
+
* of broken _DOD and ignoring returned value here doesn't cause
1354
+
* any issues later.
1355
+
*/
1356
+
acpi_video_device_enumerate(video);
1354
1357
1355
1358
list_for_each_entry(dev, &device->children, node) {
1356
1359
+1
-1
drivers/thermal/exynos_thermal.c
+1
-1
drivers/thermal/exynos_thermal.c
+1
-1
drivers/thermal/rcar_thermal.c
+1
-1
drivers/thermal/rcar_thermal.c
···
210
210
goto error_free_priv;
211
211
}
212
212
213
-
zone = thermal_zone_device_register("rcar_thermal", 0, priv,
213
+
zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
214
214
&rcar_thermal_zone_ops, 0, 0);
215
215
if (IS_ERR(zone)) {
216
216
dev_err(&pdev->dev, "thermal zone device is NULL\n");