diff options
| author | Chen Guoyin <guoyin.chen@nxp.com> | 2018-01-10 10:59:42 +0800 |
|---|---|---|
| committer | Chen Guoyin <guoyin.chen@nxp.com> | 2018-02-09 12:30:53 +0800 |
| commit | d5165a63bae231ac0566b45735d8da84ef7c8de1 (patch) | |
| tree | 1e51df28689892adeb514c59ecca22eac0d7b828 | |
| parent | 5c4d5b1fa8dc7e6648f09f0b7d159b1227d61573 (diff) | |
| download | imx-v4.9-d5165a63bae231ac0566b45735d8da84ef7c8de1.tar.gz | |
MA-11358 LCD FB cannot be initiliazed on i.MX7D
i.MX7D LCDIF FB won't be initialized with below commit:
Revert "MLK-16137 video: fbdev: add defer probe for mxs framebuffer"
There is no host->dispdrv to be registered by i.MX7D LCDIF. Only
EPROBE_DEFER when needed
This reverts commit f7b48681ec68e2c2f3aeedef31efd17f104c2c44.
Change-Id: I8b16b6355b5765d9a2328b9db06ec27476871d73
| -rw-r--r-- | drivers/video/fbdev/mxsfb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index cbea2a4fb357..52cf5cf901e4 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -1648,9 +1648,14 @@ static int mxsfb_dispdrv_init(struct platform_device *pdev, kfree(setting.dft_mode_str); - if (IS_ERR(host->dispdrv)) - return -EPROBE_DEFER; - else + if (IS_ERR(host->dispdrv)) { + if (PTR_ERR(host->dispdrv) == -EPROBE_DEFER) + return PTR_ERR(host->dispdrv); + + host->dispdrv = NULL; + dev_info(dev, "failed to find mxc display driver %s\n", + disp_dev); + } else dev_info(dev, "registered mxc display driver %s\n", disp_dev); |