Re: [PATCH] cpcihp_generic: prevent loading without "bridge" parameter

[Scott Murray]

On Sat, 14 Oct 2006, Akinobu Mita wrote:

> cpcihp_generic module requires configured "bridge" module parameter.
> But it can be loaded successfully without that parameter.
> Because module init call ends up returning positive value.
> 
> This patch prevents from loading without setting "bridge" module parameter.
> 
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Cc: Scott Murray <scottm@xxxxxxxxxxxxxxxx>
> Signed-off-by: Akinbou Mita <akinobu.mita@xxxxxxxxx>

Signed-off-by: Scott Murray <scottm@xxxxxxxxxxxxxxxx>

> Index: work-fault-inject/drivers/pci/hotplug/cpcihp_generic.c
> ===================================================================
> --- work-fault-inject.orig/drivers/pci/hotplug/cpcihp_generic.c
> +++ work-fault-inject/drivers/pci/hotplug/cpcihp_generic.c
> @@ -84,7 +84,7 @@ static int __init validate_parameters(vo
>  
>  	if(!bridge) {
>  		info("not configured, disabling.");
> -		return 1;
> +		return -EINVAL;
>  	}
>  	str = bridge;
>  	if(!*str)
> @@ -147,7 +147,7 @@ static int __init cpcihp_generic_init(vo
>  
>  	info(DRIVER_DESC " version: " DRIVER_VERSION);
>  	status = validate_parameters();
> -	if(status != 0)
> +	if (status)
>  		return status;
>  
>  	r = request_region(port, 1, "#ENUM hotswap signal register");

-- 
Scott Murray
SOMA Networks, Inc.
Toronto, Ontario
e-mail: scottm@xxxxxxxxxxxxxxxx
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/