Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 0ebcd9baca79..c7e921973f66 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -97,7 +97,8 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         struct list_head head;
         struct lpfc_dmabuf *bdeBuf;
 
-        lpfc_bsg_ct_unsol_event(phba, pring, piocbq);
+        if (lpfc_bsg_ct_unsol_event(phba, pring, piocbq) == 0)
+                return;
 
         if (unlikely(icmd->ulpStatus == IOSTAT_NEED_BUFFER)) {
                 lpfc_sli_hbqbuf_add_hbqs(phba, LPFC_ELS_HBQ);
@@ -181,7 +182,8 @@ lpfc_sli4_ct_abort_unsol_event(struct lpfc_hba *phba,
         uint32_t size;
 
         /* Forward abort event to any process registered to receive ct event */
-        lpfc_bsg_ct_unsol_event(phba, pring, piocbq);
+        if (lpfc_bsg_ct_unsol_event(phba, pring, piocbq) == 0)
+                return;
 
         /* If there is no BDE associated with IOCB, there is nothing to do */
         if (icmd->ulpBdeCount == 0)
@@ -1843,12 +1845,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag)
                 c  = (rev & 0x0000ff00) >> 8;
                 b4 = (rev & 0x000000ff);
 
-                if (flag)
-                        sprintf(fwrevision, "%d.%d%d%c%d ", b1,
-                                b2, b3, c, b4);
-                else
-                        sprintf(fwrevision, "%d.%d%d%c%d ", b1,
-                                b2, b3, c, b4);
+                sprintf(fwrevision, "%d.%d%d%c%d", b1, b2, b3, c, b4);
         }
         return;
 }