Commit b8a1171f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-video' and 'cpufreq-fixes' 

* acpi-video:
  ACPI / video: Fix circular lock dependency issue in the video-detect code

* cpufreq-fixes:
  cpufreq: exynos: Fix for memory leak in case SoC name does not match
parents 2c6625cd 7231ed1a 62c3f2fd

drivers/acpi/video_detect.c

+13 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/module.h>

#include <linux/pci.h>

#include <linux/types.h>

#include <linux/workqueue.h>

#include <acpi/video.h>



ACPI_MODULE_NAME("video");
@@ -41,6 +42,7 @@ void acpi_video_unregister_backlight(void); 


static bool backlight_notifier_registered;

static struct notifier_block backlight_nb;

static struct work_struct backlight_notify_work;



static enum acpi_backlight_type acpi_backlight_cmdline = acpi_backlight_undef;

static enum acpi_backlight_type acpi_backlight_dmi = acpi_backlight_undef;
@@ -262,6 +264,13 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
	{ },

};



/* This uses a workqueue to avoid various locking ordering issues */

static void acpi_video_backlight_notify_work(struct work_struct *work)

{

	if (acpi_video_get_backlight_type() != acpi_backlight_video)

		acpi_video_unregister_backlight();

}



static int acpi_video_backlight_notify(struct notifier_block *nb,

				       unsigned long val, void *bd)

{
@@ -269,9 +278,8 @@ static int acpi_video_backlight_notify(struct notifier_block *nb, 


	/* A raw bl registering may change video -> native */

	if (backlight->props.type == BACKLIGHT_RAW &&

	    val == BACKLIGHT_REGISTERED &&

	    acpi_video_get_backlight_type() != acpi_backlight_video)

		acpi_video_unregister_backlight();

	    val == BACKLIGHT_REGISTERED)

		schedule_work(&backlight_notify_work);



	return NOTIFY_OK;

}
@@ -304,6 +312,8 @@ enum acpi_backlight_type acpi_video_get_backlight_type(void) 
		acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,

				    ACPI_UINT32_MAX, find_video, NULL,

				    &video_caps, NULL);

		INIT_WORK(&backlight_notify_work,

			  acpi_video_backlight_notify_work);

		backlight_nb.notifier_call = acpi_video_backlight_notify;

		backlight_nb.priority = 0;

		if (backlight_register_notifier(&backlight_nb) == 0)

drivers/cpufreq/exynos-cpufreq.c

+4 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) 
		ret = exynos5250_cpufreq_init(exynos_info);

	} else {

		pr_err("%s: Unknown SoC type\n", __func__);

		return -ENODEV;

		ret = -ENODEV;

	}



	if (ret)
@@ -188,12 +188,14 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) 


	if (exynos_info->set_freq == NULL) {

		dev_err(&pdev->dev, "No set_freq function (ERR)\n");

		ret = -EINVAL;

		goto err_vdd_arm;

	}



	arm_regulator = regulator_get(NULL, "vdd_arm");

	if (IS_ERR(arm_regulator)) {

		dev_err(&pdev->dev, "failed to get resource vdd_arm\n");

		ret = -EINVAL;

		goto err_vdd_arm;

	}
@@ -225,7 +227,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) 
	regulator_put(arm_regulator);

err_vdd_arm:

	kfree(exynos_info);

	return -EINVAL;

	return ret;

}



static struct platform_driver exynos_cpufreq_platdrv = {