diff options
author | James Smart <james.smart@emulex.com> | 2010-06-07 15:23:35 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 13:01:32 -0400 |
commit | 6e7288d9a4b6691bf13fb07e3593d70d725d0737 (patch) | |
tree | 96541fadecb72ba942848da0c7ae71d772392849 /drivers/scsi/lpfc/lpfc_attr.c | |
parent | ffc954936b134cc6d2eba1282cc71084929c3704 (diff) |
[SCSI] lpfc 8.3.13: Initialization code clean up and fixes.
- Add poll or wait flag parameter to hba_init_link and hba_down_link.
- (From Linux Community) Make return with ENXIO negative.
- Remove unused INB code from driver.
- Prevent block_magmt_io from returning until mailbox is inactive.
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_attr.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_attr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index bf33b315f93e..b17fe5149e38 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -506,10 +506,10 @@ lpfc_link_state_store(struct device *dev, struct device_attribute *attr, | |||
506 | 506 | ||
507 | if ((strncmp(buf, "up", sizeof("up") - 1) == 0) && | 507 | if ((strncmp(buf, "up", sizeof("up") - 1) == 0) && |
508 | (phba->link_state == LPFC_LINK_DOWN)) | 508 | (phba->link_state == LPFC_LINK_DOWN)) |
509 | status = phba->lpfc_hba_init_link(phba); | 509 | status = phba->lpfc_hba_init_link(phba, MBX_NOWAIT); |
510 | else if ((strncmp(buf, "down", sizeof("down") - 1) == 0) && | 510 | else if ((strncmp(buf, "down", sizeof("down") - 1) == 0) && |
511 | (phba->link_state >= LPFC_LINK_UP)) | 511 | (phba->link_state >= LPFC_LINK_UP)) |
512 | status = phba->lpfc_hba_down_link(phba); | 512 | status = phba->lpfc_hba_down_link(phba, MBX_NOWAIT); |
513 | 513 | ||
514 | if (status == 0) | 514 | if (status == 0) |
515 | return strlen(buf); | 515 | return strlen(buf); |