diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2010-03-18 14:50:38 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 16:24:09 +0200 |
| commit | ffb7fef32b98fff773a5a6882ae4f8aee65a7708 (patch) | |
| tree | 24d23adcebfdb89a9691b19d0967457c7ebb28b0 /drivers/message/fusion/mptspi.c | |
| parent | [SCSI] mptfusion: mpt_detach is called properly at the time of rmmod (diff) | |
| download | linux-ffb7fef32b98fff773a5a6882ae4f8aee65a7708.tar.xz linux-ffb7fef32b98fff773a5a6882ae4f8aee65a7708.zip | |
[SCSI] mptfusion: Proper bus_type check is added
Added proper bus_type check before processing event/ reset handler.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index e44365193fdf..8820591a693b 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -1152,6 +1152,9 @@ mptspi_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) u8 event = le32_to_cpu(pEvReply->Event) & 0xFF; struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh); + if (ioc->bus_type != SPI) + return 0; + if (hd && event == MPI_EVENT_INTEGRATED_RAID) { int reason = (le32_to_cpu(pEvReply->Data[0]) & 0x00FF0000) >> 16; @@ -1283,6 +1286,8 @@ mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) int rc; rc = mptscsih_ioc_reset(ioc, reset_phase); + if ((ioc->bus_type != SPI) || (!rc)) + return rc; /* only try to do a renegotiation if we're properly set up * if we get an ioc fault on bringup, ioc->sh will be NULL */ |