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

Commit 8d0a0ac0 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'fixes' into devel

parents 01dabe91 b09eed7f

drivers/pinctrl/intel/pinctrl-merrifield.c

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev) 
	 */

	nfamilies = ARRAY_SIZE(mrfld_families),

	families = devm_kmemdup(&pdev->dev, mrfld_families,

					    nfamilies * sizeof(mrfld_families),

					    sizeof(mrfld_families),

					    GFP_KERNEL);

	if (!families)

		return -ENOMEM;

drivers/pinctrl/samsung/pinctrl-samsung.c

+1 −9
Original line number Diff line number Diff line
@@ -1041,17 +1041,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	if (!dev->of_node) {

		dev_err(dev, "device tree node not found\n");

		return -ENODEV;

	}



	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata) {

		dev_err(dev, "failed to allocate memory for driver's "

				"private data\n");

	if (!drvdata)

		return -ENOMEM;

	}



	ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev);

	if (IS_ERR(ctrl)) {