diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2015-08-06 15:09:54 +0200 |
|---|---|---|
| committer | Peter Chen <peter.chen@freescale.com> | 2015-08-14 09:13:13 +0800 |
| commit | ef12da914ed696745b495bea22aea137e88cffb6 (patch) | |
| tree | 42e8385c0436cd868fa4f5963bb9ce9d9b67fee5 | |
| parent | bc24937943d9f71a1e32b5dc4e2f0ef8fcc07b64 (diff) | |
| download | op-kernel-dev-ef12da914ed696745b495bea22aea137e88cffb6.zip op-kernel-dev-ef12da914ed696745b495bea22aea137e88cffb6.tar.gz | |
usb: chipidea: imx: properly check for usbmisc
If usbmisc hasn't probed yet, defer the probe.
It's not enough to check if the platform device for the OF node of the
usbmisc has been registered, but it also needs to have been probed
already before we can call imx_usbmisc_init().
This can happen if the order in which devices are probed change due to
async probing or on-demand probing of dependencies.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index 6d2a85a..9ccae5a 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -104,7 +104,7 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev) misc_pdev = of_find_device_by_node(args.np); of_node_put(args.np); - if (!misc_pdev) + if (!misc_pdev || !platform_get_drvdata(misc_pdev)) return ERR_PTR(-EPROBE_DEFER); data->dev = &misc_pdev->dev; |
