diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2009-09-02 11:43:36 +0530 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2009-09-12 09:35:25 -0500 |
| commit | 9e39089b958818c8f3d772414cd27f84fb2622f2 (patch) | |
| tree | 9117ffceb2bbfd29296eb0f154a20fd3b25ece3c | |
| parent | 5bab08858cecaacba803e8c90638db14bde470c0 (diff) | |
| download | linux-9e39089b958818c8f3d772414cd27f84fb2622f2.tar.bz2 | |
[SCSI] mptsas : Sanity check for phyinfo is added
Check for phyinfo->phy before calling sas_port_delete_phy.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/message/fusion/mptsas.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 21bd78e4f306..f744f0fc9491 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -852,7 +852,13 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info) port_details->num_phys--; port_details->phy_bitmask &= ~ (1 << phy_info->phy_id); memset(&phy_info->attached, 0, sizeof(struct mptsas_devinfo)); - sas_port_delete_phy(port_details->port, phy_info->phy); + if (phy_info->phy) { + devtprintk(ioc, dev_printk(KERN_DEBUG, + &phy_info->phy->dev, MYIOC_s_FMT + "delete phy %d, phy-obj (0x%p)\n", ioc->name, + phy_info->phy_id, phy_info->phy)); + sas_port_delete_phy(port_details->port, phy_info->phy); + } phy_info->port_details = NULL; } |