浏览代码

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>
Akinobu Mita 18 年之前
父节点
当前提交
49c61cca2b
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/pci/hotplug/cpcihp_generic.c

+ 2 - 2
drivers/pci/hotplug/cpcihp_generic.c

@@ -84,7 +84,7 @@ static int __init validate_parameters(void)
 
 
 	if(!bridge) {
 	if(!bridge) {
 		info("not configured, disabling.");
 		info("not configured, disabling.");
-		return 1;
+		return -EINVAL;
 	}
 	}
 	str = bridge;
 	str = bridge;
 	if(!*str)
 	if(!*str)
@@ -147,7 +147,7 @@ static int __init cpcihp_generic_init(void)
 
 
 	info(DRIVER_DESC " version: " DRIVER_VERSION);
 	info(DRIVER_DESC " version: " DRIVER_VERSION);
 	status = validate_parameters();
 	status = validate_parameters();
-	if(status != 0)
+	if (status)
 		return status;
 		return status;
 
 
 	r = request_region(port, 1, "#ENUM hotswap signal register");
 	r = request_region(port, 1, "#ENUM hotswap signal register");