diff options
-rw-r--r-- | drivers/net/ehea/ehea.h | 2 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_qmr.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 002d918fb4c7..9930d5f8b9e1 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | 41 | ||
42 | #define DRV_NAME "ehea" | 42 | #define DRV_NAME "ehea" |
43 | #define DRV_VERSION "EHEA_0095" | 43 | #define DRV_VERSION "EHEA_0096" |
44 | 44 | ||
45 | /* eHEA capability flags */ | 45 | /* eHEA capability flags */ |
46 | #define DLPAR_PORT_ADD_REM 1 | 46 | #define DLPAR_PORT_ADD_REM 1 |
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c index 9d006878f045..3c0ec82f36fb 100644 --- a/drivers/net/ehea/ehea_qmr.c +++ b/drivers/net/ehea/ehea_qmr.c | |||
@@ -653,7 +653,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add | |||
653 | int top = ehea_calc_index(i, EHEA_TOP_INDEX_SHIFT); | 653 | int top = ehea_calc_index(i, EHEA_TOP_INDEX_SHIFT); |
654 | int dir = ehea_calc_index(i, EHEA_DIR_INDEX_SHIFT); | 654 | int dir = ehea_calc_index(i, EHEA_DIR_INDEX_SHIFT); |
655 | int idx = i & EHEA_INDEX_MASK; | 655 | int idx = i & EHEA_INDEX_MASK; |
656 | 656 | ||
657 | if (add) { | 657 | if (add) { |
658 | int ret = ehea_init_bmap(ehea_bmap, top, dir); | 658 | int ret = ehea_init_bmap(ehea_bmap, top, dir); |
659 | if (ret) | 659 | if (ret) |
@@ -780,7 +780,7 @@ void ehea_destroy_busmap(void) | |||
780 | 780 | ||
781 | kfree(ehea_bmap); | 781 | kfree(ehea_bmap); |
782 | ehea_bmap = NULL; | 782 | ehea_bmap = NULL; |
783 | out_destroy: | 783 | out_destroy: |
784 | mutex_unlock(&ehea_busmap_mutex); | 784 | mutex_unlock(&ehea_busmap_mutex); |
785 | } | 785 | } |
786 | 786 | ||
@@ -858,10 +858,10 @@ static u64 ehea_reg_mr_sections(int top, int dir, u64 *pt, | |||
858 | for (idx = 0; idx < EHEA_MAP_ENTRIES; idx++) { | 858 | for (idx = 0; idx < EHEA_MAP_ENTRIES; idx++) { |
859 | if (!ehea_bmap->top[top]->dir[dir]->ent[idx]) | 859 | if (!ehea_bmap->top[top]->dir[dir]->ent[idx]) |
860 | continue; | 860 | continue; |
861 | 861 | ||
862 | hret = ehea_reg_mr_section(top, dir, idx, pt, adapter, mr); | 862 | hret = ehea_reg_mr_section(top, dir, idx, pt, adapter, mr); |
863 | if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED)) | 863 | if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED)) |
864 | return hret; | 864 | return hret; |
865 | } | 865 | } |
866 | return hret; | 866 | return hret; |
867 | } | 867 | } |
@@ -879,7 +879,7 @@ static u64 ehea_reg_mr_dir_sections(int top, u64 *pt, | |||
879 | 879 | ||
880 | hret = ehea_reg_mr_sections(top, dir, pt, adapter, mr); | 880 | hret = ehea_reg_mr_sections(top, dir, pt, adapter, mr); |
881 | if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED)) | 881 | if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED)) |
882 | return hret; | 882 | return hret; |
883 | } | 883 | } |
884 | return hret; | 884 | return hret; |
885 | } | 885 | } |