aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptspi.c
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2010-03-18 09:50:38 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-04-11 10:24:09 -0400
commitffb7fef32b98fff773a5a6882ae4f8aee65a7708 (patch)
tree24d23adcebfdb89a9691b19d0967457c7ebb28b0 /drivers/message/fusion/mptspi.c
parent48959f1eae3068fefb3de05cdc0c2bd8f0f96c37 (diff)
[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.c5
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)
1152 u8 event = le32_to_cpu(pEvReply->Event) & 0xFF; 1152 u8 event = le32_to_cpu(pEvReply->Event) & 0xFF;
1153 struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh); 1153 struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
1154 1154
1155 if (ioc->bus_type != SPI)
1156 return 0;
1157
1155 if (hd && event == MPI_EVENT_INTEGRATED_RAID) { 1158 if (hd && event == MPI_EVENT_INTEGRATED_RAID) {
1156 int reason 1159 int reason
1157 = (le32_to_cpu(pEvReply->Data[0]) & 0x00FF0000) >> 16; 1160 = (le32_to_cpu(pEvReply->Data[0]) & 0x00FF0000) >> 16;
@@ -1283,6 +1286,8 @@ mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
1283 int rc; 1286 int rc;
1284 1287
1285 rc = mptscsih_ioc_reset(ioc, reset_phase); 1288 rc = mptscsih_ioc_reset(ioc, reset_phase);
1289 if ((ioc->bus_type != SPI) || (!rc))
1290 return rc;
1286 1291
1287 /* only try to do a renegotiation if we're properly set up 1292 /* only try to do a renegotiation if we're properly set up
1288 * if we get an ioc fault on bringup, ioc->sh will be NULL */ 1293 * if we get an ioc fault on bringup, ioc->sh will be NULL */