Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

omapfb: dss: Handle return errors in dss_init_ports()

dss_init_ports() is not handling return errors from dpi_init_port() and
sdi_init_port(). It is also always returning 0 currently which results in
part of error handling code in dss_bind() being unused.

Fix dss_init_ports() to handle return errors from dpi_init_port() and
sdi_init_port().

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: tomi.valkeinen@ti.com
[b.zolnierkie: fail early on errors, minor fixups]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

authored by

Arvind Yadav and committed by
Bartlomiej Zolnierkiewicz
0348aaa3 c1ae3cfa

+11 -5
+11 -5
drivers/video/fbdev/omap2/omapfb/dss/dss.c
··· 941 941 return 0; 942 942 } 943 943 944 + static void dss_uninit_ports(struct platform_device *pdev); 945 + 944 946 static int dss_init_ports(struct platform_device *pdev) 945 947 { 946 948 struct device_node *parent = pdev->dev.of_node; 947 949 struct device_node *port; 948 - int r; 950 + int r, ret = 0; 949 951 950 952 if (parent == NULL) 951 953 return 0; ··· 974 972 975 973 switch (port_type) { 976 974 case OMAP_DISPLAY_TYPE_DPI: 977 - dpi_init_port(pdev, port); 975 + ret = dpi_init_port(pdev, port); 978 976 break; 979 977 case OMAP_DISPLAY_TYPE_SDI: 980 - sdi_init_port(pdev, port); 978 + ret = sdi_init_port(pdev, port); 981 979 break; 982 980 default: 983 981 break; 984 982 } 985 - } while ((port = omapdss_of_get_next_port(parent, port)) != NULL); 983 + } while (!ret && 984 + (port = omapdss_of_get_next_port(parent, port)) != NULL); 986 985 987 - return 0; 986 + if (ret) 987 + dss_uninit_ports(pdev); 988 + 989 + return ret; 988 990 } 989 991 990 992 static void dss_uninit_ports(struct platform_device *pdev)