lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-11-03 15:25:14 -07:00
parent 209c510e36 3ae53b1e13
commit 225ff868e1
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/video.c
View File

@@ -1345,12 +1345,15 @@ static int
acpi_video_bus_get_devices(struct acpi_video_bus *video, acpi_video_bus_get_devices(struct acpi_video_bus *video,
struct acpi_device *device) struct acpi_device *device)
{ {
int status; int status = 0;
struct acpi_device *dev; struct acpi_device *dev;
status = acpi_video_device_enumerate(video); /*
if (status) * There are systems where video module known to work fine regardless
return status; * of broken _DOD and ignoring returned value here doesn't cause
* any issues later.
*/
acpi_video_device_enumerate(video);
list_for_each_entry(dev, &device->children, node) { list_for_each_entry(dev, &device->children, node) {

2
drivers/thermal/exynos_thermal.c
View File

@@ -815,7 +815,7 @@ static struct platform_device_id exynos_tmu_driver_ids[] = {
}, },
{ }, { },
}; };
MODULE_DEVICE_TABLE(platform, exynos4_tmu_driver_ids); MODULE_DEVICE_TABLE(platform, exynos_tmu_driver_ids);
static inline struct exynos_tmu_platform_data *exynos_get_driver_data( static inline struct exynos_tmu_platform_data *exynos_get_driver_data(
struct platform_device *pdev) struct platform_device *pdev)

2
drivers/thermal/rcar_thermal.c
View File

@@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_free_priv; goto error_free_priv;
} }
zone = thermal_zone_device_register("rcar_thermal", 0, priv, zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
&rcar_thermal_zone_ops, 0, 0); &rcar_thermal_zone_ops, 0, 0);
if (IS_ERR(zone)) { if (IS_ERR(zone)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n"); dev_err(&pdev->dev, "thermal zone device is NULL\n");