From 342eb09baac97adc3bb2dece2d1fcaef4aba5e23 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sat, 27 Oct 2012 19:53:11 +0200 Subject: [PATCH] --- yaml --- r: 336385 b: refs/heads/master c: dffa91230f5202a78ccc97960ae1c84e533b036a h: refs/heads/master i: 336383: 1aed76677c38407721821043fcb641e7867a865b v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-at91.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14c0ab43287c..bd86774841d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a728c7cdd033f0cbeacc302d2409a2428e68e1be +refs/heads/master: dffa91230f5202a78ccc97960ae1c84e533b036a diff --git a/trunk/drivers/pinctrl/pinctrl-at91.c b/trunk/drivers/pinctrl/pinctrl-at91.c index 676b199d6d22..5bb7d515e24c 100644 --- a/trunk/drivers/pinctrl/pinctrl-at91.c +++ b/trunk/drivers/pinctrl/pinctrl-at91.c @@ -838,7 +838,7 @@ static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev, return -ENODEV; info->dev = &pdev->dev; - info->ops = + info->ops = (struct at91_pinctrl_mux_ops*) of_match_device(at91_pinctrl_of_match, &pdev->dev)->data; at91_pinctrl_child_count(info, np); @@ -1403,7 +1403,7 @@ static int __devinit at91_gpio_probe(struct platform_device *pdev) goto err; } - at91_chip->ops = + at91_chip->ops = (struct at91_pinctrl_mux_ops*) of_match_device(at91_gpio_of_match, &pdev->dev)->data; at91_chip->pioc_virq = irq; at91_chip->pioc_idx = alias_idx;