Commit 1e2332b2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[PATCH] fix that devfs mess

parent 20284391
...@@ -1489,24 +1489,20 @@ static int __init init_scsi(void) ...@@ -1489,24 +1489,20 @@ static int __init init_scsi(void)
error = scsi_init_procfs(); error = scsi_init_procfs();
if (error) if (error)
goto cleanup_queue; goto cleanup_queue;
error = -ENOMEM;
if (!devfs_mk_dir(NULL, "scsi", NULL))
goto cleanup_procfs;
error = scsi_dev_info_list_init(scsi_dev_flags); error = scsi_dev_info_list_init(scsi_dev_flags);
if (error) if (error)
goto cleanup_devfs; goto cleanup_procfs;
error = scsi_sysfs_register(); error = scsi_sysfs_register();
if (error) if (error)
goto cleanup_devlist; goto cleanup_devlist;
scsi_host_init(); scsi_host_init();
devfs_mk_dir(NULL, "scsi", NULL);
open_softirq(SCSI_SOFTIRQ, scsi_softirq, NULL); open_softirq(SCSI_SOFTIRQ, scsi_softirq, NULL);
return 0; return 0;
cleanup_devlist: cleanup_devlist:
scsi_dev_info_list_delete(); scsi_dev_info_list_delete();
cleanup_devfs:
devfs_remove("scsi");
cleanup_procfs: cleanup_procfs:
scsi_exit_procfs(); scsi_exit_procfs();
cleanup_queue: cleanup_queue:
......
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