diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-19 11:00:41 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-19 11:00:41 -0400 |
| commit | f3f08dcb9965f42378851ce888fb7539607712e6 (patch) | |
| tree | 9fd6f0060757ca354c97d69a1719ba2f4d7c3953 | |
| parent | cbd8d842319c8084c050292e7d167be2a4cf1ad9 (diff) | |
| parent | 3e48b1baa042a4d5e92f373fc945a4aa0081178b (diff) | |
Merge branch 'imx/pinctrl' into next/pinctrl
* imx/pinctrl:
mtd: nand: gpmi: fix compile error caused by pinctrl call
| -rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 8478fd9701a3..b68e04310bd8 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |||
| @@ -496,7 +496,7 @@ static int __devinit acquire_resources(struct gpmi_nand_data *this) | |||
| 496 | if (ret) | 496 | if (ret) |
| 497 | goto exit_dma_channels; | 497 | goto exit_dma_channels; |
| 498 | 498 | ||
| 499 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | 499 | pinctrl = devm_pinctrl_get_select_default(&this->pdev->dev); |
| 500 | if (IS_ERR(pinctrl)) { | 500 | if (IS_ERR(pinctrl)) { |
| 501 | ret = PTR_ERR(pinctrl); | 501 | ret = PTR_ERR(pinctrl); |
| 502 | goto exit_pin; | 502 | goto exit_pin; |