diff options
Diffstat (limited to 'drivers/message/fusion/mptsas.c')
-rw-r--r-- | drivers/message/fusion/mptsas.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 40dbaaaf49e..dc23adf9a30 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
@@ -1122,9 +1122,9 @@ static int mptsas_get_linkerrors(struct sas_phy *phy) | |||
1122 | static int mptsas_mgmt_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, | 1122 | static int mptsas_mgmt_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, |
1123 | MPT_FRAME_HDR *reply) | 1123 | MPT_FRAME_HDR *reply) |
1124 | { | 1124 | { |
1125 | ioc->sas_mgmt.status |= MPT_SAS_MGMT_STATUS_COMMAND_GOOD; | 1125 | ioc->sas_mgmt.status |= MPT_MGMT_STATUS_COMMAND_GOOD; |
1126 | if (reply != NULL) { | 1126 | if (reply != NULL) { |
1127 | ioc->sas_mgmt.status |= MPT_SAS_MGMT_STATUS_RF_VALID; | 1127 | ioc->sas_mgmt.status |= MPT_MGMT_STATUS_RF_VALID; |
1128 | memcpy(ioc->sas_mgmt.reply, reply, | 1128 | memcpy(ioc->sas_mgmt.reply, reply, |
1129 | min(ioc->reply_sz, 4 * reply->u.reply.MsgLength)); | 1129 | min(ioc->reply_sz, 4 * reply->u.reply.MsgLength)); |
1130 | } | 1130 | } |
@@ -1182,7 +1182,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset) | |||
1182 | 1182 | ||
1183 | /* a reply frame is expected */ | 1183 | /* a reply frame is expected */ |
1184 | if ((ioc->sas_mgmt.status & | 1184 | if ((ioc->sas_mgmt.status & |
1185 | MPT_IOCTL_STATUS_RF_VALID) == 0) { | 1185 | MPT_MGMT_STATUS_RF_VALID) == 0) { |
1186 | error = -ENXIO; | 1186 | error = -ENXIO; |
1187 | goto out_unlock; | 1187 | goto out_unlock; |
1188 | } | 1188 | } |
@@ -1359,7 +1359,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, | |||
1359 | } | 1359 | } |
1360 | mf = NULL; | 1360 | mf = NULL; |
1361 | 1361 | ||
1362 | if (ioc->sas_mgmt.status & MPT_IOCTL_STATUS_RF_VALID) { | 1362 | if (ioc->sas_mgmt.status & MPT_MGMT_STATUS_RF_VALID) { |
1363 | SmpPassthroughReply_t *smprep; | 1363 | SmpPassthroughReply_t *smprep; |
1364 | 1364 | ||
1365 | smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply; | 1365 | smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply; |