From 3b405e30cbcac3aa327ae04a29e7da5d084a4933 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 8 Jun 2017 09:55:30 +1200 Subject: EDAC, mv64x60: Sanity check edac_op_state before registering edac_op_state is a module parameter which affects the behaviour of the driver probe which can potentially be invoked as soon as the platform driver registration happens. Because of this we need to ensure that we sanity check the module parameter before calling platform_register_drivers(). Signed-off-by: Chris Packham Cc: linux-edac Link: http://lkml.kernel.org/r/20170607215530.8604-1-chris.packham@alliedtelesis.co.nz Signed-off-by: Borislav Petkov --- drivers/edac/mv64x60_edac.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/edac') diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index 77bfc3d882a8..d3650df94fe8 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c @@ -853,11 +853,6 @@ static struct platform_driver * const drivers[] = { static int __init mv64x60_edac_init(void) { - int ret; - - ret = platform_register_drivers(drivers, ARRAY_SIZE(drivers)); - if (ret) - return ret; printk(KERN_INFO "Marvell MV64x60 EDAC driver " MV64x60_REVISION "\n"); printk(KERN_INFO "\t(C) 2006-2007 MontaVista Software\n"); @@ -872,7 +867,7 @@ static int __init mv64x60_edac_init(void) break; } - return 0; + return platform_register_drivers(drivers, ARRAY_SIZE(drivers)); } module_init(mv64x60_edac_init); -- cgit v1.2.3