patch-2.4.0-test9 linux/drivers/cdrom/cdrom.c

• Lines: 19
• Date: Mon Sep 25 17:05:01 2000
• Orig file: v2.4.0-test8/linux/drivers/cdrom/cdrom.c
• Orig date: Tue Sep 5 13:46:15 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
@@ -1118,6 +1118,7 @@
 		cdinfo(CD_DVD, "entering DVD_LU_SEND_RPC_STATE\n");
 		setup_report_key(&cgc, 0, 8);
 		memset(&rpc_state, 0, sizeof(rpc_state_t));
+		cgc.buffer = (char *) &rpc_state;
 
 		if ((ret = cdo->generic_packet(cdi, &cgc)))
 			return ret;
@@ -2571,8 +2572,9 @@
 		return;
 
 	cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 1);
+#ifdef CONFIG_PROC_FS
 	cdrom_root_table->child->de->owner = THIS_MODULE;
-
+#endif /* CONFIG_PROC_FS */
 	/* set the defaults */
 	cdrom_sysctl_settings.autoclose = autoclose;
 	cdrom_sysctl_settings.autoeject = autoeject;