Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195591
b: refs/heads/master
c: ffb7fef
h: refs/heads/master
i:
  195589: 3305113
  195587: 6ae53a4
  195583: 32a9275
v: v3
  • Loading branch information
Kashyap, Desai authored and James Bottomley committed Apr 11, 2010
1 parent 4505b47 commit cea0bea
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 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: 48959f1eae3068fefb3de05cdc0c2bd8f0f96c37
refs/heads/master: ffb7fef32b98fff773a5a6882ae4f8aee65a7708
5 changes: 4 additions & 1 deletion trunk/drivers/message/fusion/mptfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1358,6 +1358,9 @@ mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
unsigned long flags;
int rc=1;

if (ioc->bus_type != FC)
return 0;

devtverboseprintk(ioc, printk(MYIOC_s_DEBUG_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n",
ioc->name, event));

Expand Down Expand Up @@ -1396,7 +1399,7 @@ mptfc_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
unsigned long flags;

rc = mptscsih_ioc_reset(ioc,reset_phase);
if (rc == 0)
if ((ioc->bus_type != FC) || (!rc))
return rc;


Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/message/fusion/mptsas.c
Original file line number Diff line number Diff line change
Expand Up @@ -4779,6 +4779,9 @@ mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
struct fw_event_work *fw_event;
unsigned long delay;

if (ioc->bus_type != SAS)
return 0;

/* events turned off due to host reset or driver unloading */
if (ioc->fw_events_off)
return 0;
Expand Down
5 changes: 5 additions & 0 deletions trunk/drivers/message/fusion/mptspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit cea0bea

Please sign in to comment.