Commit a5a7521e authored by Patrick Mochel's avatar Patrick Mochel

Merge bk://ldm.bkbits.net/linux-2.5-driverfs

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-driverfs
parents 7de3c5f1 9997c9f3
...@@ -432,11 +432,6 @@ int unregister_cdrom(struct cdrom_device_info *unreg) ...@@ -432,11 +432,6 @@ int unregister_cdrom(struct cdrom_device_info *unreg)
topCdromPtr = cdi->next; topCdromPtr = cdi->next;
cdi->ops->n_minors--; cdi->ops->n_minors--;
devfs_unregister (cdi->de); devfs_unregister (cdi->de);
if (atomic_read (&cdi->cdrom_driverfs_dev.refcount)) {
device_remove_file (&cdi->cdrom_driverfs_dev, "name");
device_remove_file (&cdi->cdrom_driverfs_dev, "kdev");
put_device (&cdi->cdrom_driverfs_dev);
}
devfs_dealloc_unique_number (&cdrom_numspace, cdi->number); devfs_dealloc_unique_number (&cdrom_numspace, cdi->number);
cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name); cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment