patch-2.4.27 linux-2.4.27/drivers/acpi/toshiba_acpi.c

• Lines: 26
• Date: 2004-08-07 16:26:04.660347024 -0700
• Orig file: linux-2.4.26/drivers/acpi/toshiba_acpi.c
• Orig date: 2004-04-14 06:05:29.000000000 -0700

diff -urN linux-2.4.26/drivers/acpi/toshiba_acpi.c linux-2.4.27/drivers/acpi/toshiba_acpi.c
@@ -503,6 +503,8 @@
 		proc = create_proc_read_entry(item->name,
 			S_IFREG | S_IRUGO | S_IWUSR,
 			toshiba_proc_dir, (read_proc_t*)dispatch_read, item);
+		if (proc)
+			proc->owner = THIS_MODULE;
 		if (proc && item->write_func)
 			proc->write_proc = (write_proc_t*)dispatch_write;
 	}
@@ -526,6 +528,8 @@
 	acpi_status status = AE_OK;
 	u32 hci_result;
 
+	if (acpi_disabled)
+		return -ENODEV;
 	/* simple device detection: look for HCI method */
 	if (is_valid_acpi_path(METHOD_HCI_1))
 		method_hci = METHOD_HCI_1;
@@ -548,6 +552,7 @@
 	if (!toshiba_proc_dir) {
 		status = AE_ERROR;
 	} else {
+		toshiba_proc_dir->owner = THIS_MODULE;
 		status = add_device();
 		if (ACPI_FAILURE(status))
 			remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);