Patch "omapfb: dss: Handle return errors in dss_init_ports()" has been added to the 4.9-stable tree
This is a note to let you know that I've just added the patch titled
omapfb: dss: Handle return errors in dss_init_ports()
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
omapfb-dss-handle-return-errors-in-dss_init_ports.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Mar 18 16:55:33 CET 2018
From: Arvind Yadav <[email protected]>
Date: Mon, 20 Mar 2017 18:30:59 +0100
Subject: omapfb: dss: Handle return errors in dss_init_ports()
From: Arvind Yadav <[email protected]>
[ Upstream commit 0348aaa34412e24ebe622a2b1b013e68d6ae5412 ]
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().
--- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/video/fbdev/omap2/omapfb/dss/dss.c +11 -5
@@ -941,11 +941,13 @@ static int dss_init_features(struct platreturn 0 ; } +static void dss_uninit_ports (struct platform_device *pdev); +static int dss_init_ports (struct platform_device *pdev) {struct device_node *parent = pdev->dev.of_node;struct device_node *port; -int r; +int r, ret =0 ;if (parent ==NULL )return 0 ;
@@ -972,17 +974,21 @@ static int dss_init_ports(struct platforswitch (port_type) {case OMAP_DISPLAY_TYPE_DPI : -dpi_init_port (pdev, port); + ret =dpi_init_port (pdev, port);break ;case OMAP_DISPLAY_TYPE_SDI : -sdi_init_port (pdev, port); + ret =sdi_init_port (pdev, port);break ;default :break ; } - }while ((port =omapdss_of_get_next_port (parent, port)) !=NULL ); + }while (!ret && + (port =omapdss_of_get_next_port (parent, port)) !=NULL ); -return 0 ; +if (ret) +dss_uninit_ports (pdev); + +return ret; }static void dss_uninit_ports (struct platform_device *pdev)
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/omapfb-dss-handle-return-errors-in-dss_init_ports.patch