Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195590
b: refs/heads/master
c: 48959f1
h: refs/heads/master
v: v3
  • Loading branch information
Kashyap, Desai authored and James Bottomley committed Apr 11, 2010
1 parent 3305113 commit 4505b47
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3b97316d5861b1708cd7ef2df9989d12d97acb9
refs/heads/master: 48959f1eae3068fefb3de05cdc0c2bd8f0f96c37
6 changes: 6 additions & 0 deletions trunk/drivers/message/fusion/mptsas.c
Original file line number Diff line number Diff line change
Expand Up @@ -5073,6 +5073,12 @@ static void __devexit mptsas_remove(struct pci_dev *pdev)
struct mptsas_portinfo *p, *n;
int i;

if (!ioc->sh) {
printk(MYIOC_s_INFO_FMT "IOC is in Target mode\n", ioc->name);
mpt_detach(pdev);
return;
}

mptsas_shutdown(pdev);

mptsas_del_device_components(ioc);
Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/message/fusion/mptscsih.c
Original file line number Diff line number Diff line change
Expand Up @@ -1149,11 +1149,6 @@ mptscsih_remove(struct pci_dev *pdev)
MPT_SCSI_HOST *hd;
int sz1;

if(!host) {
mpt_detach(pdev);
return;
}

scsi_remove_host(host);

if((hd = shost_priv(host)) == NULL)
Expand Down

0 comments on commit 4505b47

Please sign in to comment.