Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 225ff868 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 209c510e 3ae53b1e

drivers/acpi/video.c

+7 −4
Original line number Diff line number Diff line
@@ -1345,12 +1345,15 @@ static int 
acpi_video_bus_get_devices(struct acpi_video_bus *video,

			   struct acpi_device *device)

{

	int status;

	int status = 0;

	struct acpi_device *dev;



	status = acpi_video_device_enumerate(video);

	if (status)

		return status;

	/*

	 * There are systems where video module known to work fine regardless

	 * 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) {

drivers/thermal/exynos_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -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(

			struct platform_device *pdev)

drivers/thermal/rcar_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
		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);

	if (IS_ERR(zone)) {

		dev_err(&pdev->dev, "thermal zone device is NULL\n");