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

Commit 92556e60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:
 "Two fixes for the pin control subsystem, both relating to the error
  path in probe()

  I'm a bit snowed under by mail but these have boiled in linux-next and
  should propagate to you"

* tag 'pinctrl-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: berlin: fix an error code in berlin_pinctrl_probe()
  pinctrl: sunxi: Fix potential null pointer dereference
parents cd3de83f 1419d815

drivers/pinctrl/berlin/berlin.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int berlin_pinctrl_probe(struct platform_device *pdev, 


	regmap = dev_get_regmap(&pdev->dev, NULL);

	if (!regmap)

		return PTR_ERR(regmap);

		return -ENODEV;



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

	if (!pctrl)

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ static int sunxi_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, 
			configlen++;



		pinconfig = kzalloc(configlen * sizeof(*pinconfig), GFP_KERNEL);

		if (!pinconfig) {

			kfree(*map);

			return -ENOMEM;

		}



		if (!of_property_read_u32(node, "allwinner,drive", &val)) {

			u16 strength = (val + 1) * 10;