diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /drivers/scsi/hosts.c | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 5fd2da494d08..c968cc31cd86 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
| @@ -164,8 +164,8 @@ void scsi_remove_host(struct Scsi_Host *shost) | |||
| 164 | return; | 164 | return; |
| 165 | } | 165 | } |
| 166 | spin_unlock_irqrestore(shost->host_lock, flags); | 166 | spin_unlock_irqrestore(shost->host_lock, flags); |
| 167 | mutex_unlock(&shost->scan_mutex); | ||
| 168 | scsi_forget_host(shost); | 167 | scsi_forget_host(shost); |
| 168 | mutex_unlock(&shost->scan_mutex); | ||
| 169 | scsi_proc_host_rm(shost); | 169 | scsi_proc_host_rm(shost); |
| 170 | 170 | ||
| 171 | spin_lock_irqsave(shost->host_lock, flags); | 171 | spin_lock_irqsave(shost->host_lock, flags); |