Commit 49c61cca authored Oct 14, 2006 by Akinobu Mita Committed by Greg Kroah-Hartman Oct 18, 2006

cpcihp_generic: prevent loading without "bridge" parameter



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.

Signed-off-by: Akinbou Mita <akinobu.mita@gmail.com>
Signed-off-by: Scott Murray <scottm@somanetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 29f3eb64

drivers/pci/hotplug/cpcihp_generic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ static int __init validate_parameters(void)

		if(!bridge) {
		info("not configured, disabling.");
		return 1;
		return -EINVAL;
		}
		str = bridge;
		if(!*str)
		@@ -147,7 +147,7 @@ static int __init cpcihp_generic_init(void)

		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");