Attachment #458388 for bug #604414




static void __exit
vmci_exit(void)
{
   int retval;

   if (guestDeviceInit) {
      pci_unregister_driver(&vmci_driver);
      vfree(data_buffer);


      VMCI_HostCleanup();

      misc_deregister(&linuxState.misc); 
      if (retval) {
         Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
      } else {
         Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
      }

      hostDeviceInit = FALSE;
   }

Lines 406-414 Link Here

(-)work.orig/vmmon-only/linux/driver.c (-3 / +1 lines)
406	#ifdef VMX86_DEVEL	406	#ifdef VMX86_DEVEL
407	unregister_chrdev(linuxState.major, linuxState.deviceName);	407	unregister_chrdev(linuxState.major, linuxState.deviceName);
408	#else	408	#else
409	if (misc_deregister(&linuxState.misc)) {	409	misc_deregister(&linuxState.misc);
410	Warning("Module %s: error unregistering\n", linuxState.deviceName);
411	}
412	#endif	410	#endif
413		411
414	Log("Module %s: unloaded\n", linuxState.deviceName);	412	Log("Module %s: unloaded\n", linuxState.deviceName);

Return to bug 604414

Lines 2463-2470 Link Here

(-)work.orig/vmci-only/linux/driver.c (-8 / +1 lines)
2463	static void __exit	2463	static void __exit
2464	vmci_exit(void)	2464	vmci_exit(void)
2465	{	2465	{
2466	int retval;
2467
2468	if (guestDeviceInit) {	2466	if (guestDeviceInit) {
2469	pci_unregister_driver(&vmci_driver);	2467	pci_unregister_driver(&vmci_driver);
2470	vfree(data_buffer);	2468	vfree(data_buffer);
Lines 2476-2487 Link Here
2476		2474
2477	VMCI_HostCleanup();	2475	VMCI_HostCleanup();
2478		2476
2479	retval = misc_deregister(&linuxState.misc);	2477	misc_deregister(&linuxState.misc);
2480	if (retval) {
2481	Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
2482	} else {
2483	Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
2484	}
2485		2478
2486	hostDeviceInit = FALSE;	2479	hostDeviceInit = FALSE;
2487	}	2480	}