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

Commit 82c79565 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'origin/v3.18/topic/OPPv2' into linux-linaro-lsk-v3.18

parents 9ce0d731 38f3e89d

drivers/base/firmware_class.c

+0 −1
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ fw_create_instance(struct firmware *firmware, const char *fw_name, 


	fw_priv = kzalloc(sizeof(*fw_priv), GFP_KERNEL);

	if (!fw_priv) {

		dev_err(device, "%s: kmalloc failed\n", __func__);

		fw_priv = ERR_PTR(-ENOMEM);

		goto exit;

	}

drivers/base/power/clock_ops.c

+1 −3
Original line number Diff line number Diff line
@@ -80,10 +80,8 @@ int pm_clk_add(struct device *dev, const char *con_id) 
		return -EINVAL;



	ce = kzalloc(sizeof(*ce), GFP_KERNEL);

	if (!ce) {

		dev_err(dev, "Not enough memory for clock entry.\n");

	if (!ce)

		return -ENOMEM;

	}



	if (con_id) {

		ce->con_id = kstrdup(con_id, GFP_KERNEL);

drivers/base/power/opp.c

+1054 −127

File changed.

Preview size limit exceeded, changes collapsed.

drivers/cpufreq/arm_big_little_dt.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static int generic_bL_remove(struct platform_device *pdev) 
static struct platform_driver generic_bL_platdrv = {

	.driver = {

		.name	= "arm-bL-cpufreq-dt",

		.owner	= THIS_MODULE,

	},

	.probe		= generic_bL_probe,

	.remove		= generic_bL_remove,