Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acfc1cc1 authored by Wang Dongsheng's avatar Wang Dongsheng Committed by Tomi Valkeinen
Browse files

video: fbdev: fsl: Fix kernel crash when diu_ops is not implemented 



If diu_ops is not implemented on platform, kernel will access a NULL
pointer. We need to check this pointer in DIU initialization.

Signed-off-by: default avatarWang Dongsheng <dongsheng.wang@freescale.com>
Acked-by: default avatarTimur Tabi <timur@tabi.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 527e9316

drivers/video/fbdev/fsl-diu-fb.c

+12 −1
Original line number Diff line number Diff line
@@ -479,7 +479,10 @@ static enum fsl_diu_monitor_port fsl_diu_name_to_port(const char *s) 
			port = FSL_DIU_PORT_DLVDS;

	}



	return diu_ops.valid_monitor_port(port);

	if (diu_ops.valid_monitor_port)

		port = diu_ops.valid_monitor_port(port);



	return port;

}



/*
@@ -1915,6 +1918,14 @@ static int __init fsl_diu_init(void) 
#else

	monitor_port = fsl_diu_name_to_port(monitor_string);

#endif



	/*

	 * Must to verify set_pixel_clock. If not implement on platform,

	 * then that means that there is no platform support for the DIU.

	 */

	if (!diu_ops.set_pixel_clock)

		return -ENODEV;



	pr_info("Freescale Display Interface Unit (DIU) framebuffer driver\n");



#ifdef CONFIG_NOT_COHERENT_CACHE