fedora core 2.6.10-1.12-FC2

[linux-2.6.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 8d8cc69..6b2fd2e 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -79,8 +79,6 @@ void scsi_remove_host(struct Scsi_Host *shost)
 
        set_bit(SHOST_DEL, &shost->shost_state);
 
-       if (shost->transportt->host_destroy)
-               shost->transportt->host_destroy(shost);
        class_device_unregister(&shost->shost_classdev);
        if (shost->transport_classdev.class)
                class_device_unregister(&shost->transport_classdev);
@@ -135,14 +133,11 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev)
 
        error = scsi_sysfs_add_host(shost);
        if (error)
-               goto out_destroy_host;
+               goto out_del_classdev;
 
        scsi_proc_host_add(shost);
        return error;
 
- out_destroy_host:
-       if (shost->transportt->host_destroy)
-               shost->transportt->host_destroy(shost);
  out_del_classdev:
        class_device_del(&shost->shost_classdev);
  out_del_gendev: