Don't call device_remove_file() from cdrom layer, since they're not even

the ones that create the file.

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 7b6dbbee9d95196ea5dabcfc660cf2915026f89d..6626f1ce75762515555e2261d40b4ae1ea0db33f 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -432,11 +432,6 @@ int unregister_cdrom(struct cdrom_device_info *unreg)
                topCdromPtr = cdi->next;
        cdi->ops->n_minors--;
        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);
        cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
        return 0;