Message ID | 1352955159.6793.2.camel@phoenix (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Dear Axel Lin, On Thu, 15 Nov 2012 12:52:39 +0800, Axel Lin wrote: > of_match_device() may return NULL. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> Why? We already discussed together that this situation could not happen: if you are in the probe() function, then there *must* be a match, because the probe() function precisely gets called when there is a match. So unless you give more details about what the problem is, I don't think this patch and the similar one you sent for Dove are useful. Best regards, Thomas
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c index 9a74ef6..fe885ca 100644 --- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c +++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c @@ -444,8 +444,11 @@ static struct of_device_id kirkwood_pinctrl_of_match[] __devinitdata = { static int __devinit kirkwood_pinctrl_probe(struct platform_device *pdev) { - const struct of_device_id *match = - of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); + const struct of_device_id *match; + + match = of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); + if (!match) + return -ENODEV; pdev->dev.platform_data = match->data; return mvebu_pinctrl_probe(pdev); }
of_match_device() may return NULL. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)