Commit 2fd215b8 authored by Amelie Delaunay's avatar Amelie Delaunay Committed by Linus Walleij
Browse files

pinctrl: stmfx: fix null pointer on remove



dev_get_platdata(&pdev->dev) returns a pointer on struct stmfx_pinctrl,
not on struct stmfx (platform_set_drvdata(pdev, pctl); in probe).
Pointer on struct stmfx is stored in driver data of pdev parent (in probe:
struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);).

Fixes: 1490d9f8 ("pinctrl: Add STMFX GPIO expander Pinctrl/GPIO driver")
Signed-off-by: default avatarAmelie Delaunay <amelie.delaunay@st.com>
Link: https://lore.kernel.org/r/20191004122342.22018-1-amelie.delaunay@st.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 48659227
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)

static int stmfx_pinctrl_remove(struct platform_device *pdev)
{
	struct stmfx *stmfx = dev_get_platdata(&pdev->dev);
	struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);

	return stmfx_function_disable(stmfx,
				      STMFX_FUNC_GPIO |