summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidycchen <davidycchen@google.com>2020-01-06 20:46:27 +0800
committerDavid Chen <davidycchen@google.com>2020-01-07 03:12:05 +0000
commit8e23d6dfb144309bd54c5b1fa0a98f3824f82319 (patch)
tree5a027dd3f10fccb8f5e99ac0ac8f0367aa0d20b0
parenta7d9e7b79f77864a93921b56c5ca0bbf329e6ca7 (diff)
downloadfts_touch_s5-8e23d6dfb144309bd54c5b1fa0a98f3824f82319.tar.gz
touch:fts: fix touch driver issue when there is no panel connected
Follow the change of drm/drm_panel.c. of_drm_find_panel will return ERR_PTR(-EPROBE_DEFER) instead of NULL when it fail to find a matching panel. Test: touch driver will exit if there is no panel connected. Bug:146907583 Change-Id: Idd1692cacaf5f7084f0293fd6b0bbc3120941a73 Signed-off-by: davidycchen <davidycchen@google.com>
-rw-r--r--fts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fts.c b/fts.c
index 6399b46..d101003 100644
--- a/fts.c
+++ b/fts.c
@@ -5260,7 +5260,7 @@ static int parse_dt(struct device *dev, struct fts_hw_platform_data *bdata)
return -EPROBE_DEFER;
panel = of_drm_find_panel(panelmap.np);
of_node_put(panelmap.np);
- if (panel) {
+ if (!IS_ERR_OR_NULL(panel)) {
bdata->panel = panel;
bdata->initial_panel_index = panelmap.args[0];
break;