X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2Froot_plug.c;h=be0ebec2580b14165f24f9cbc9fac3778b73b15b;hb=5402a7349d26875f69c184badf87b88541b1cf6c;hp=a41cf42a4fa0b5d68921f632d329dbf5cb9d7d76;hpb=513694b5f931a62561d21eb97a4740ce37464a45;p=linux-2.6 diff --git a/security/root_plug.c b/security/root_plug.c index a41cf42a4f..be0ebec258 100644 --- a/security/root_plug.c +++ b/security/root_plug.c @@ -28,9 +28,6 @@ #include #include -/* flag to keep track of how we were registered */ -static int secondary; - /* default is a generic type of usb to serial converter */ static int vendor_id = 0x0557; static int product_id = 0x2008; @@ -97,13 +94,7 @@ static int __init rootplug_init (void) if (register_security (&rootplug_security_ops)) { printk (KERN_INFO "Failure registering Root Plug module with the kernel\n"); - /* try registering with primary module */ - if (mod_reg_security (MY_NAME, &rootplug_security_ops)) { - printk (KERN_INFO "Failure registering Root Plug " - " module with primary security module.\n"); return -EINVAL; - } - secondary = 1; } printk (KERN_INFO "Root Plug module initialized, " "vendor_id = %4.4x, product id = %4.4x\n", vendor_id, product_id);