From 16571f02364dc792887bdf6d14a9e6c13c265116 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 27 Feb 2009 16:51:42 -0500 Subject: [PATCH] --- yaml --- r: 136278 b: refs/heads/master c: 77c019768f0607c36e25bec11ce3e1eabef09277 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hosts.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad1dc6d71a64..96e3ed1f28d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 058bb82c5628c88af802c19e2b56ae43551552d5 +refs/heads/master: 77c019768f0607c36e25bec11ce3e1eabef09277 diff --git a/trunk/drivers/scsi/hosts.c b/trunk/drivers/scsi/hosts.c index aa670a1d1513..89d41a424b33 100644 --- a/trunk/drivers/scsi/hosts.c +++ b/trunk/drivers/scsi/hosts.c @@ -176,7 +176,6 @@ void scsi_remove_host(struct Scsi_Host *shost) transport_unregister_device(&shost->shost_gendev); device_unregister(&shost->shost_dev); device_del(&shost->shost_gendev); - scsi_proc_hostdir_rm(shost->hostt); } EXPORT_SYMBOL(scsi_remove_host); @@ -270,6 +269,8 @@ static void scsi_host_dev_release(struct device *dev) struct Scsi_Host *shost = dev_to_shost(dev); struct device *parent = dev->parent; + scsi_proc_hostdir_rm(shost->hostt); + if (shost->ehandler) kthread_stop(shost->ehandler); if (shost->work_q)