aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fbdev/atmel_lcdfb.c')
-rw-r--r--drivers/video/fbdev/atmel_lcdfb.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 19eb42b57d87..a6da82648c92 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1120,7 +1120,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
1120 goto put_display_node; 1120 goto put_display_node;
1121 } 1121 }
1122 1122
1123 timings_np = of_find_node_by_name(display_np, "display-timings"); 1123 timings_np = of_get_child_by_name(display_np, "display-timings");
1124 if (!timings_np) { 1124 if (!timings_np) {
1125 dev_err(dev, "failed to find display-timings node\n"); 1125 dev_err(dev, "failed to find display-timings node\n");
1126 ret = -ENODEV; 1126 ret = -ENODEV;
@@ -1141,6 +1141,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
1141 fb_add_videomode(&fb_vm, &info->modelist); 1141 fb_add_videomode(&fb_vm, &info->modelist);
1142 } 1142 }
1143 1143
1144 /*
1145 * FIXME: Make sure we are not referencing any fields in display_np
1146 * and timings_np and drop our references to them before returning to
1147 * avoid leaking the nodes on probe deferral and driver unbind.
1148 */
1149
1144 return 0; 1150 return 0;
1145 1151
1146put_timings_node: 1152put_timings_node: