diff -r 7506e67dd122 -r 059a9e712aa7 devices/8139too.c --- a/devices/8139too.c Tue Jan 17 18:28:15 2006 +0000 +++ b/devices/8139too.c Fri Jan 20 13:32:31 2006 +0000 @@ -2982,7 +2982,7 @@ out_ec_dev: if (rtl_ec_dev) { printk(KERN_INFO "Unregistering RTL8139-EtherCAT device...\n"); - EtherCAT_dev_unregister(ec_device_master_index); + EtherCAT_dev_unregister(ec_device_master_index, rtl_ec_dev); rtl_ec_dev = NULL; } @@ -2998,14 +2998,14 @@ printk(KERN_INFO "Cleaning up RTL8139-EtherCAT module...\n"); + pci_unregister_driver(&rtl8139_pci_driver); + if (rtl_ec_dev) { printk(KERN_INFO "Unregistering RTL8139-EtherCAT device...\n"); - EtherCAT_dev_unregister(ec_device_master_index); + EtherCAT_dev_unregister(ec_device_master_index, rtl_ec_dev); rtl_ec_dev = NULL; } - pci_unregister_driver(&rtl8139_pci_driver); - printk(KERN_INFO "RTL8139-EtherCAT module cleaned up.\n"); /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<*/