diff options
| author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-02-23 18:03:04 +0200 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:30:47 +0800 |
| commit | 7ef4bfecb24cdf7c4ab3a9dd0f60ab0e7159c42b (patch) | |
| tree | a986fc801589acff57c3f45868b36b71f9752692 /drivers/video | |
| parent | 36d999e5340ccbebc33d2c8241ea6f1940f5baa9 (diff) | |
video: mxfsb: Fix endless -EPROBE_DEFER with empty disp_dev
Since f7b48681ec68 ("MLK-16137 video: fbdev: add defer probe for mxs framebuffer")
the mxsfb_dispdrv_init function will return -EPROBE_DEFER on all
mxc_dispdrv_gethandle failures. That makes sense because all
mxc_dispdrv_entry are registered in their respective probe functions and
an absent entry should result in probing mxsfb later.
However in some cases an the disp_dev is empty and those configurations
now result in enless EPROBE_DEFER loops. Fix this by accepting empty
disp_dev at the start of mxsfb_dispdrv_init.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Robert Chiras <robert.chiras@nxp.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/mxsfb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index 15ab40234ab6..98cd5e3f0105 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -1474,6 +1474,9 @@ static int mxsfb_dispdrv_init(struct platform_device *pdev, struct device *dev = &pdev->dev; char disp_dev[32]; + if (!strlen(host->disp_dev)) + return 0; + memset(&setting, 0x0, sizeof(setting)); setting.fbi = fbi; memcpy(disp_dev, host->disp_dev, strlen(host->disp_dev)); |