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

Commit fbe8ed63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-fixes-v3.10-1' of... 

Merge tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl fixes from Linus Walleij:
 "Two fixes to the pinctrl subsystem for v3.10:
   - A quite apparent mutex fix in an untested codepath
   - A compile warning fix in the plgpio driver"

* tag 'pinctrl-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node()
  pinctrl: plgpio: add CONFIG_PM_SLEEP to suspend/resume functions
parents 99bece77 d463f82d

drivers/pinctrl/core.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ struct pinctrl_dev *get_pinctrl_dev_from_of_node(struct device_node *np) 
			return pctldev;

		}



	mutex_lock(&pinctrldev_list_mutex);

	mutex_unlock(&pinctrldev_list_mutex);



	return NULL;

}

drivers/pinctrl/spear/pinctrl-plgpio.c

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct plgpio { 
	int			(*o2p)(int offset);	/* offset_to_pin */

	u32			p2o_regs;

	struct plgpio_regs	regs;

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	struct plgpio_regs	*csave_regs;

#endif

};
@@ -554,7 +554,7 @@ static int plgpio_probe(struct platform_device *pdev) 
	if (IS_ERR(plgpio->clk))

		dev_warn(&pdev->dev, "clk_get() failed, work without it\n");



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	plgpio->csave_regs = devm_kzalloc(&pdev->dev,

			sizeof(*plgpio->csave_regs) *

			DIV_ROUND_UP(plgpio->chip.ngpio, MAX_GPIO_PER_REG),
@@ -641,7 +641,7 @@ static int plgpio_probe(struct platform_device *pdev) 
	return ret;

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int plgpio_suspend(struct device *dev)

{

	struct plgpio *plgpio = dev_get_drvdata(dev);